Autogenerated HTML docs for v2.43.0-581-g5216f
diff --git a/MyFirstContribution.html b/MyFirstContribution.html index 63c845e..ab7dffa 100644 --- a/MyFirstContribution.html +++ b/MyFirstContribution.html
@@ -735,7 +735,7 @@ <body class="article"> <div id="header"> <h1>My First Contribution to the Git Project</h1> -<span id="revdate">2024-02-06</span> +<span id="revdate">2024-02-08</span> </div> <div id="content"> <div class="sect1">
diff --git a/MyFirstObjectWalk.html b/MyFirstObjectWalk.html index 2402363..20523d6 100644 --- a/MyFirstObjectWalk.html +++ b/MyFirstObjectWalk.html
@@ -735,7 +735,7 @@ <body class="article"> <div id="header"> <h1>My First Object Walk</h1> -<span id="revdate">2024-02-06</span> +<span id="revdate">2024-02-08</span> </div> <div id="content"> <div class="sect1">
diff --git a/RelNotes/2.44.0.txt b/RelNotes/2.44.0.txt index 8615306..148d18d 100644 --- a/RelNotes/2.44.0.txt +++ b/RelNotes/2.44.0.txt
@@ -84,6 +84,13 @@ * The write codepath for the reftable data learned to honor core.fsync configuration. + * The "--fsck-objects" option of "git index-pack" now can take the + optional parameter to tweak severity of different fsck errors. + + * The wincred credential backend has been taught to support oauth + refresh token the same way as credential-cache and + credential-libsecret backends. + Performance, Internal Implementation, Development Support etc. @@ -141,6 +148,9 @@ the path to the same library directory for link time and runtime. A Makefile template is used to reduce such repetition. + * The priority queue test has been migrated to the unit testing + framework. + Fixes since v2.43 ----------------- @@ -284,6 +294,10 @@ FreeBSD that is no longer available, which has been corrected. (merge 81fffb66d3 cb/use-freebsd-13-2-at-cirrus-ci later to maint). + * A caller called index_file_exists() that takes a string expressed + as <ptr, length> with a wrong length, which has been corrected. + (merge 156e28b36d jh/sparse-index-expand-to-path-fix later to maint). + * Other code cleanup, docfix, build fix, etc. (merge 50f1abcff6 js/packfile-h-typofix later to maint). (merge cbf498eb53 jb/reflog-expire-delete-dry-run-options later to maint).
diff --git a/ReviewingGuidelines.html b/ReviewingGuidelines.html index 8e759c8..82b2f76 100644 --- a/ReviewingGuidelines.html +++ b/ReviewingGuidelines.html
@@ -735,7 +735,7 @@ <body class="article"> <div id="header"> <h1>Reviewing Patches in the Git Project</h1> -<span id="revdate">2024-02-06</span> +<span id="revdate">2024-02-08</span> </div> <div id="content"> <div class="sect1">
diff --git a/SubmittingPatches.html b/SubmittingPatches.html index d491a03..88f6732 100644 --- a/SubmittingPatches.html +++ b/SubmittingPatches.html
@@ -735,7 +735,7 @@ <body class="article"> <div id="header"> <h1>Submitting Patches</h1> -<span id="revdate">2024-02-06</span> +<span id="revdate">2024-02-08</span> </div> <div id="content"> <div class="sect1">
diff --git a/ToolsForGit.html b/ToolsForGit.html index abb9278..168a581 100644 --- a/ToolsForGit.html +++ b/ToolsForGit.html
@@ -735,7 +735,7 @@ <body class="article"> <div id="header"> <h1>Tools for developing Git</h1> -<span id="revdate">2024-02-06</span> +<span id="revdate">2024-02-08</span> </div> <div id="content"> <div class="sect1">
diff --git a/diff-options.txt b/diff-options.txt index 53ec3c9..aaaff0d 100644 --- a/diff-options.txt +++ b/diff-options.txt
@@ -299,7 +299,7 @@ Synonym for --dirstat=cumulative --dirstat-by-file[=<param1,param2>...]:: - Synonym for --dirstat=files,param1,param2... + Synonym for --dirstat=files,<param1>,<param2>... --summary:: Output a condensed summary of extended header information
diff --git a/everyday.html b/everyday.html index 2a66e52..2f3cc8d 100644 --- a/everyday.html +++ b/everyday.html
@@ -735,7 +735,7 @@ <body class="article"> <div id="header"> <h1>Everyday Git With 20 Commands Or So</h1> -<span id="revdate">2024-02-06</span> +<span id="revdate">2024-02-08</span> </div> <div id="content"> <div id="preamble">
diff --git a/git-blame.html b/git-blame.html index 9c0a73b..49b3f86 100644 --- a/git-blame.html +++ b/git-blame.html
@@ -1347,7 +1347,7 @@ </p> <div class="literalblock"> <div class="content"> -<pre><code><40-byte hex sha1> <sourceline> <resultline> <num_lines></code></pre> +<pre><code><40-byte-hex-sha1> <sourceline> <resultline> <num-lines></code></pre> </div></div> <div class="paragraph"><p>Line numbers count from 1.</p></div> </li> @@ -1498,7 +1498,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2023-10-23 14:43:46 PDT + 2024-02-08 15:45:59 PST </div> </div> </body>
diff --git a/git-blame.txt b/git-blame.txt index 5720d04..b1d7fb5 100644 --- a/git-blame.txt +++ b/git-blame.txt
@@ -210,7 +210,7 @@ . Each blame entry always starts with a line of: - <40-byte hex sha1> <sourceline> <resultline> <num_lines> + <40-byte-hex-sha1> <sourceline> <resultline> <num-lines> + Line numbers count from 1.
diff --git a/git-bugreport.html b/git-bugreport.html index 280115b..0660aa9 100644 --- a/git-bugreport.html +++ b/git-bugreport.html
@@ -843,7 +843,7 @@ <dd> <p> Specify an alternate suffix for the bugreport name, to create a file - named <em>git-bugreport-<formatted suffix></em>. This should take the form of a + named <em>git-bugreport-<formatted-suffix></em>. This should take the form of a strftime(3) format string; the current local time will be used. </p> </dd> @@ -858,7 +858,7 @@ Create a zip archive of supplemental information about the user’s machine, Git client, and repository state. The archive is written to the same output directory as the bug report and is named - <em>git-diagnostics-<formatted suffix></em>. + <em>git-diagnostics-<formatted-suffix></em>. </p> <div class="paragraph"><p>Without <code>mode</code> specified, the diagnostic archive will contain the default set of statistics reported by <code>git diagnose</code>. An optional <code>mode</code> value may be specified @@ -880,7 +880,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2023-10-23 14:43:46 PDT + 2024-02-08 15:45:59 PST </div> </div> </body>
diff --git a/git-bugreport.txt b/git-bugreport.txt index 392d9eb..ca626f7 100644 --- a/git-bugreport.txt +++ b/git-bugreport.txt
@@ -52,7 +52,7 @@ -s <format>:: --suffix <format>:: Specify an alternate suffix for the bugreport name, to create a file - named 'git-bugreport-<formatted suffix>'. This should take the form of a + named 'git-bugreport-<formatted-suffix>'. This should take the form of a strftime(3) format string; the current local time will be used. --no-diagnose:: @@ -60,7 +60,7 @@ Create a zip archive of supplemental information about the user's machine, Git client, and repository state. The archive is written to the same output directory as the bug report and is named - 'git-diagnostics-<formatted suffix>'. + 'git-diagnostics-<formatted-suffix>'. + Without `mode` specified, the diagnostic archive will contain the default set of statistics reported by `git diagnose`. An optional `mode` value may be specified
diff --git a/git-clone.html b/git-clone.html index aa445fd..0aba355 100644 --- a/git-clone.html +++ b/git-clone.html
@@ -1380,8 +1380,8 @@ configuration section of the form:</p></div> <div class="listingblock"> <div class="content"> -<pre><code> [url "<actual url base>"] - insteadOf = <other url base></code></pre> +<pre><code> [url "<actual-url-base>"] + insteadOf = <other-url-base></code></pre> </div></div> <div class="paragraph"><p>For example, with this:</p></div> <div class="listingblock"> @@ -1396,8 +1396,8 @@ configuration section of the form:</p></div> <div class="listingblock"> <div class="content"> -<pre><code> [url "<actual url base>"] - pushInsteadOf = <other url base></code></pre> +<pre><code> [url "<actual-url-base>"] + pushInsteadOf = <other-url-base></code></pre> </div></div> <div class="paragraph"><p>For example, with this:</p></div> <div class="listingblock">
diff --git a/git-commit-graph.html b/git-commit-graph.html index c7e3188..b887bea 100644 --- a/git-commit-graph.html +++ b/git-commit-graph.html
@@ -753,7 +753,7 @@ <em>git commit-graph write</em> [--object-dir <dir>] [--append] [--split[=<strategy>]] [--reachable | --stdin-packs | --stdin-commits] [--changed-paths] [--[no-]max-new-filters <n>] [--[no-]progress] - <split options></pre> + <split-options></pre> <div class="attribution"> </div></div> </div> @@ -989,7 +989,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2022-10-28 11:53:56 PDT + 2024-02-08 15:45:59 PST </div> </div> </body>
diff --git a/git-commit-graph.txt b/git-commit-graph.txt index c8dbceb..903b168 100644 --- a/git-commit-graph.txt +++ b/git-commit-graph.txt
@@ -13,7 +13,7 @@ 'git commit-graph write' [--object-dir <dir>] [--append] [--split[=<strategy>]] [--reachable | --stdin-packs | --stdin-commits] [--changed-paths] [--[no-]max-new-filters <n>] [--[no-]progress] - <split options> + <split-options> DESCRIPTION
diff --git a/git-config.html b/git-config.html index 3f23dc5..ea90500 100644 --- a/git-config.html +++ b/git-config.html
@@ -899,11 +899,11 @@ </dt> <dd> <p> - When given a two-part name section.key, the value for - section.<URL>.key whose <URL> part matches the best to the + When given a two-part <name> as <section>.<key>, the value for + <section>.<URL>.<key> whose <URL> part matches the best to the given URL is returned (if no such key exists, the value for - section.key is used as a fallback). When given just the - section as name, do so for all the keys in the section and + <section>.<key> is used as a fallback). When given just the + <section> as name, do so for all the keys in the section and list them. Returns error code 1 if no value is found. </p> </dd> @@ -11262,7 +11262,7 @@ </li> <li> <p> -<code>af_unix:[<socket_type>:]<absolute-pathname></code> - Write to a +<code>af_unix:[<socket-type>:]<absolute-pathname></code> - Write to a Unix DomainSocket (on platforms that support them). Socket type can be either <code>stream</code> or <code>dgram</code>; if omitted Git will try both. @@ -11895,7 +11895,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2023-09-22 17:04:28 PDT + 2024-02-08 15:45:59 PST </div> </div> </body>
diff --git a/git-config.txt b/git-config.txt index b1caac8..dff3909 100644 --- a/git-config.txt +++ b/git-config.txt
@@ -103,11 +103,11 @@ names are not. --get-urlmatch <name> <URL>:: - When given a two-part name section.key, the value for - section.<URL>.key whose <URL> part matches the best to the + When given a two-part <name> as <section>.<key>, the value for + <section>.<URL>.<key> whose <URL> part matches the best to the given URL is returned (if no such key exists, the value for - section.key is used as a fallback). When given just the - section as name, do so for all the keys in the section and + <section>.<key> is used as a fallback). When given just the + <section> as name, do so for all the keys in the section and list them. Returns error code 1 if no value is found. --global::
diff --git a/git-cvsserver.html b/git-cvsserver.html index a9f96a9..3e25307 100644 --- a/git-cvsserver.html +++ b/git-cvsserver.html
@@ -988,7 +988,7 @@ Clients should now be able to check out the project. Use the CVS <em>module</em> name to indicate what Git <em>head</em> you want to check out. This also sets the name of your newly checked-out directory, unless you tell it otherwise with - <code>-d <dir_name></code>. For example, this checks out <em>master</em> branch to the + <code>-d <dir-name></code>. For example, this checks out <em>master</em> branch to the <code>project-master</code> directory: </p> <div class="listingblock"> @@ -1015,7 +1015,7 @@ the database to work reliably (otherwise you need to make sure that the database is up to date any time <em>git-cvsserver</em> is executed).</p></div> <div class="paragraph"><p>By default it uses SQLite databases in the Git directory, named -<code>gitcvs.<module_name>.sqlite</code>. Note that the SQLite backend creates +<code>gitcvs.<module-name>.sqlite</code>. Note that the SQLite backend creates temporary files in the same directory as the database file on write so it might not be enough to grant the users using <em>git-cvsserver</em> write access to the database file without granting @@ -1327,7 +1327,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2023-06-23 13:24:09 PDT + 2024-02-08 15:45:59 PST </div> </div> </body>
diff --git a/git-cvsserver.txt b/git-cvsserver.txt index cf4a5a2..4c475ef 100644 --- a/git-cvsserver.txt +++ b/git-cvsserver.txt
@@ -197,7 +197,7 @@ 5. Clients should now be able to check out the project. Use the CVS 'module' name to indicate what Git 'head' you want to check out. This also sets the name of your newly checked-out directory, unless you tell it otherwise with - `-d <dir_name>`. For example, this checks out 'master' branch to the + `-d <dir-name>`. For example, this checks out 'master' branch to the `project-master` directory: + ------ @@ -224,7 +224,7 @@ that the database is up to date any time 'git-cvsserver' is executed). By default it uses SQLite databases in the Git directory, named -`gitcvs.<module_name>.sqlite`. Note that the SQLite backend creates +`gitcvs.<module-name>.sqlite`. Note that the SQLite backend creates temporary files in the same directory as the database file on write so it might not be enough to grant the users using 'git-cvsserver' write access to the database file without granting
diff --git a/git-daemon.html b/git-daemon.html index 5e2fa7a..6c1f583 100644 --- a/git-daemon.html +++ b/git-daemon.html
@@ -759,7 +759,7 @@ [--allow-override=<service>] [--forbid-override=<service>] [--access-hook=<path>] [--[no-]informative-errors] [--inetd | - [--listen=<host_or_ipaddr>] [--port=<n>] + [--listen=<host-or-ipaddr>] [--port=<n>] [--user=<user> [--group=<group>]]] [--log-destination=(stderr|syslog|none)] [<directory>…]</pre> @@ -861,13 +861,13 @@ </p> </dd> <dt class="hdlist1"> ---listen=<host_or_ipaddr> +--listen=<host-or-ipaddr> </dt> <dd> <p> Listen on a specific IP address or hostname. IP addresses can be either an IPv4 address or an IPv6 address if supported. If IPv6 - is not supported, then --listen=hostname is also not supported and + is not supported, then --listen=<hostname> is also not supported and --listen must be given an IPv4 address. Can be given more than once. Incompatible with <code>--inetd</code> option. @@ -975,8 +975,8 @@ specified with no parameter, a request to git://host/~alice/foo is taken as a request to access <em>foo</em> repository in the home directory of user <code>alice</code>. - If <code>--user-path=path</code> is specified, the same request is - taken as a request to access <code>path/foo</code> repository in + If <code>--user-path=<path></code> is specified, the same request is + taken as a request to access <code><path>/foo</code> repository in the home directory of user <code>alice</code>. </p> </dd> @@ -1281,7 +1281,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2023-10-23 14:43:46 PDT + 2024-02-08 15:45:59 PST </div> </div> </body>
diff --git a/git-daemon.txt b/git-daemon.txt index e064f91..ede7b93 100644 --- a/git-daemon.txt +++ b/git-daemon.txt
@@ -18,7 +18,7 @@ [--allow-override=<service>] [--forbid-override=<service>] [--access-hook=<path>] [--[no-]informative-errors] [--inetd | - [--listen=<host_or_ipaddr>] [--port=<n>] + [--listen=<host-or-ipaddr>] [--port=<n>] [--user=<user> [--group=<group>]]] [--log-destination=(stderr|syslog|none)] [<directory>...] @@ -86,10 +86,10 @@ Incompatible with --detach, --port, --listen, --user and --group options. ---listen=<host_or_ipaddr>:: +--listen=<host-or-ipaddr>:: Listen on a specific IP address or hostname. IP addresses can be either an IPv4 address or an IPv6 address if supported. If IPv6 - is not supported, then --listen=hostname is also not supported and + is not supported, then --listen=<hostname> is also not supported and --listen must be given an IPv4 address. Can be given more than once. Incompatible with `--inetd` option. @@ -141,8 +141,8 @@ specified with no parameter, a request to git://host/{tilde}alice/foo is taken as a request to access 'foo' repository in the home directory of user `alice`. - If `--user-path=path` is specified, the same request is - taken as a request to access `path/foo` repository in + If `--user-path=<path>` is specified, the same request is + taken as a request to access `<path>/foo` repository in the home directory of user `alice`. --verbose:: diff --git a/git-diagnose.html b/git-diagnose.html index 4fc8388..c1e3911 100644 --- a/git-diagnose.html +++ b/git-diagnose.html
@@ -824,7 +824,7 @@ <dd> <p> Specify an alternate suffix for the diagnostics archive name, to create - a file named <em>git-diagnostics-<formatted suffix></em>. This should take the + a file named <em>git-diagnostics-<formatted-suffix></em>. This should take the form of a strftime(3) format string; the current local time will be used. </p> @@ -858,7 +858,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2022-08-25 15:15:05 PDT + 2024-02-08 15:45:59 PST </div> </div> </body>
diff --git a/git-diagnose.txt b/git-diagnose.txt index 3ec8cc7..0711959 100644 --- a/git-diagnose.txt +++ b/git-diagnose.txt
@@ -45,7 +45,7 @@ -s <format>:: --suffix <format>:: Specify an alternate suffix for the diagnostics archive name, to create - a file named 'git-diagnostics-<formatted suffix>'. This should take the + a file named 'git-diagnostics-<formatted-suffix>'. This should take the form of a strftime(3) format string; the current local time will be used.
diff --git a/git-diff-files.html b/git-diff-files.html index 2c512cf..357e16e 100644 --- a/git-diff-files.html +++ b/git-diff-files.html
@@ -1108,7 +1108,7 @@ </dt> <dd> <p> - Synonym for --dirstat=files,param1,param2… + Synonym for --dirstat=files,<param1>,<param2>… </p> </dd> <dt class="hdlist1">
diff --git a/git-diff-index.html b/git-diff-index.html index 238db47..7f9d690 100644 --- a/git-diff-index.html +++ b/git-diff-index.html
@@ -1109,7 +1109,7 @@ </dt> <dd> <p> - Synonym for --dirstat=files,param1,param2… + Synonym for --dirstat=files,<param1>,<param2>… </p> </dd> <dt class="hdlist1">
diff --git a/git-diff-tree.html b/git-diff-tree.html index 54ca361..bdaf0a8 100644 --- a/git-diff-tree.html +++ b/git-diff-tree.html
@@ -1110,7 +1110,7 @@ </dt> <dd> <p> - Synonym for --dirstat=files,param1,param2… + Synonym for --dirstat=files,<param1>,<param2>… </p> </dd> <dt class="hdlist1">
diff --git a/git-diff.html b/git-diff.html index e585dda..88a3616 100644 --- a/git-diff.html +++ b/git-diff.html
@@ -1245,7 +1245,7 @@ </dt> <dd> <p> - Synonym for --dirstat=files,param1,param2… + Synonym for --dirstat=files,<param1>,<param2>… </p> </dd> <dt class="hdlist1">
diff --git a/git-difftool.html b/git-difftool.html index 62858e6..b2e1087 100644 --- a/git-difftool.html +++ b/git-difftool.html
@@ -885,7 +885,7 @@ <p> Specify a custom command for viewing diffs. <em>git-difftool</em> ignores the configured defaults and runs - <code>$command $LOCAL $REMOTE</code> when this option is specified. + <code><command> $LOCAL $REMOTE</code> when this option is specified. Additionally, <code>$BASE</code> is set in the environment. </p> </dd> @@ -1055,7 +1055,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2023-10-23 14:43:46 PDT + 2024-02-08 15:45:59 PST </div> </div> </body>
diff --git a/git-difftool.txt b/git-difftool.txt index 50cb080..c05f97a 100644 --- a/git-difftool.txt +++ b/git-difftool.txt
@@ -90,7 +90,7 @@ --extcmd=<command>:: Specify a custom command for viewing diffs. 'git-difftool' ignores the configured defaults and runs - `$command $LOCAL $REMOTE` when this option is specified. + `<command> $LOCAL $REMOTE` when this option is specified. Additionally, `$BASE` is set in the environment. -g::
diff --git a/git-fast-import.html b/git-fast-import.html index a7047a3..4d7aaaf 100644 --- a/git-fast-import.html +++ b/git-fast-import.html
@@ -1703,11 +1703,11 @@ </div> <div class="sect3"> <h4 id="_code_notemodify_code"><code>notemodify</code></h4> -<div class="paragraph"><p>Included in a <code>commit</code> <code><notes_ref></code> command to add a new note +<div class="paragraph"><p>Included in a <code>commit</code> <code><notes-ref></code> command to add a new note annotating a <code><commit-ish></code> or change this annotation contents. Internally it is similar to filemodify 100644 on <code><commit-ish></code> path (maybe split into subdirectories). It’s not advised to -use any other commands to write to the <code><notes_ref></code> tree except +use any other commands to write to the <code><notes-ref></code> tree except <code>filedeleteall</code> to delete all existing notes in this tree. This command has two different means of specifying the content of the note.</p></div> @@ -2640,7 +2640,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2023-10-23 14:43:46 PDT + 2024-02-08 15:45:59 PST </div> </div> </body>
diff --git a/git-fast-import.txt b/git-fast-import.txt index bd7b1e0..b260736 100644 --- a/git-fast-import.txt +++ b/git-fast-import.txt
@@ -745,11 +745,11 @@ `notemodify` ^^^^^^^^^^^^ -Included in a `commit` `<notes_ref>` command to add a new note +Included in a `commit` `<notes-ref>` command to add a new note annotating a `<commit-ish>` or change this annotation contents. Internally it is similar to filemodify 100644 on `<commit-ish>` path (maybe split into subdirectories). It's not advised to -use any other commands to write to the `<notes_ref>` tree except +use any other commands to write to the `<notes-ref>` tree except `filedeleteall` to delete all existing notes in this tree. This command has two different means of specifying the content of the note.
diff --git a/git-fetch.html b/git-fetch.html index 75a95d1..c026f41 100644 --- a/git-fetch.html +++ b/git-fetch.html
@@ -1535,8 +1535,8 @@ configuration section of the form:</p></div> <div class="listingblock"> <div class="content"> -<pre><code> [url "<actual url base>"] - insteadOf = <other url base></code></pre> +<pre><code> [url "<actual-url-base>"] + insteadOf = <other-url-base></code></pre> </div></div> <div class="paragraph"><p>For example, with this:</p></div> <div class="listingblock"> @@ -1551,8 +1551,8 @@ configuration section of the form:</p></div> <div class="listingblock"> <div class="content"> -<pre><code> [url "<actual url base>"] - pushInsteadOf = <other url base></code></pre> +<pre><code> [url "<actual-url-base>"] + pushInsteadOf = <other-url-base></code></pre> </div></div> <div class="paragraph"><p>For example, with this:</p></div> <div class="listingblock"> @@ -1783,8 +1783,8 @@ <div class="content"> <pre><code>$ git fetch origin --prune --prune-tags $ git fetch origin --prune 'refs/tags/*:refs/tags/*' -$ git fetch <url of origin> --prune --prune-tags -$ git fetch <url of origin> --prune 'refs/tags/*:refs/tags/*'</code></pre> +$ git fetch <url-of-origin> --prune --prune-tags +$ git fetch <url-of-origin> --prune 'refs/tags/*:refs/tags/*'</code></pre> </div></div> </div> </div> @@ -2249,7 +2249,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2023-05-15 16:02:03 PDT + 2024-02-08 15:45:59 PST </div> </div> </body>
diff --git a/git-fetch.txt b/git-fetch.txt index f123139..50900a5 100644 --- a/git-fetch.txt +++ b/git-fetch.txt
@@ -186,8 +186,8 @@ ------------------------------------------------ $ git fetch origin --prune --prune-tags $ git fetch origin --prune 'refs/tags/*:refs/tags/*' -$ git fetch <url of origin> --prune --prune-tags -$ git fetch <url of origin> --prune 'refs/tags/*:refs/tags/*' +$ git fetch <url-of-origin> --prune --prune-tags +$ git fetch <url-of-origin> --prune 'refs/tags/*:refs/tags/*' ------------------------------------------------ OUTPUT
diff --git a/git-filter-branch.html b/git-filter-branch.html index 73d68b5..e181680 100644 --- a/git-filter-branch.html +++ b/git-filter-branch.html
@@ -755,7 +755,7 @@ [--msg-filter <command>] [--commit-filter <command>] [--tag-name-filter <command>] [--prune-empty] [--original <namespace>] [-d <directory>] [-f | --force] - [--state-branch <branch>] [--] [<rev-list options>…]</pre> + [--state-branch <branch>] [--] [<rev-list-options>…]</pre> <div class="attribution"> </div></div> </div> @@ -779,7 +779,7 @@ <h2 id="_description">DESCRIPTION</h2> <div class="sectionbody"> <div class="paragraph"><p>Lets you rewrite Git revision history by rewriting the branches mentioned -in the <rev-list options>, applying custom filters on each revision. +in the <rev-list-options>, applying custom filters on each revision. Those filters can modify each tree (e.g. removing a file or running a perl rewrite on all files) or information about each commit. Otherwise, all information (including original commit times or merge @@ -1504,7 +1504,7 @@ <li> <p> Running git-filter-branch with either --tags or --all in your - <rev-list options>. In order to retain annotated tags as + <rev-list-options>. In order to retain annotated tags as annotated, you must use --tag-name-filter (and must not have restored from refs/original/ in a previously botched rewrite). </p> @@ -1626,7 +1626,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2020-11-01 22:43:13 PST + 2024-02-08 15:45:59 PST </div> </div> </body>
diff --git a/git-filter-branch.txt b/git-filter-branch.txt index 62e482a..5a4f853 100644 --- a/git-filter-branch.txt +++ b/git-filter-branch.txt
@@ -14,7 +14,7 @@ [--msg-filter <command>] [--commit-filter <command>] [--tag-name-filter <command>] [--prune-empty] [--original <namespace>] [-d <directory>] [-f | --force] - [--state-branch <branch>] [--] [<rev-list options>...] + [--state-branch <branch>] [--] [<rev-list-options>...] WARNING ------- @@ -32,7 +32,7 @@ DESCRIPTION ----------- Lets you rewrite Git revision history by rewriting the branches mentioned -in the <rev-list options>, applying custom filters on each revision. +in the <rev-list-options>, applying custom filters on each revision. Those filters can modify each tree (e.g. removing a file or running a perl rewrite on all files) or information about each commit. Otherwise, all information (including original commit times or merge @@ -624,7 +624,7 @@ real backup; it dereferences tags first.) ** Running git-filter-branch with either --tags or --all in your - <rev-list options>. In order to retain annotated tags as + <rev-list-options>. In order to retain annotated tags as annotated, you must use --tag-name-filter (and must not have restored from refs/original/ in a previously botched rewrite).
diff --git a/git-format-patch.html b/git-format-patch.html index f092feb..b069e3a 100644 --- a/git-format-patch.html +++ b/git-format-patch.html
@@ -757,10 +757,10 @@ [--signature-file=<file>] [-n | --numbered | -N | --no-numbered] [--start-number <n>] [--numbered-files] - [--in-reply-to=<message id>] [--suffix=.<sfx>] + [--in-reply-to=<message-id>] [--suffix=.<sfx>] [--ignore-if-in-upstream] [--always] [--cover-from-description=<mode>] - [--rfc] [--subject-prefix=<subject prefix>] + [--rfc] [--subject-prefix=<subject-prefix>] [(--reroll-count|-v) <n>] [--to=<email>] [--cc=<email>] [--[no-]cover-letter] [--quiet] @@ -770,8 +770,8 @@ [--range-diff=<previous> [--creation-factor=<percent>]] [--filename-max-length=<n>] [--progress] - [<common diff options>] - [ <since> | <revision range> ]</pre> + [<common-diff-options>] + [ <since> | <revision-range> ]</pre> <div class="attribution"> </div></div> </div> @@ -820,7 +820,7 @@ </li> <li> <p> -Generic <revision range> expression (see "SPECIFYING +Generic <revision-range> expression (see "SPECIFYING REVISIONS" section in <a href="gitrevisions.html">gitrevisions(7)</a>) means the commits in the specified range. </p> @@ -1166,7 +1166,7 @@ </dt> <dd> <p> - Synonym for --dirstat=files,param1,param2… + Synonym for --dirstat=files,<param1>,<param2>… </p> </dd> <dt class="hdlist1"> @@ -1782,12 +1782,12 @@ will want to ensure that threading is disabled for <code>git send-email</code>.</p></div> </dd> <dt class="hdlist1"> ---in-reply-to=<message id> +--in-reply-to=<message-id> </dt> <dd> <p> Make the first mail (or all the mails with <code>--no-thread</code>) appear as a - reply to the given <message id>, which avoids breaking threads to + reply to the given <message-id>, which avoids breaking threads to provide a new patch series. </p> </dd> @@ -1843,12 +1843,12 @@ </p> </dd> <dt class="hdlist1"> ---subject-prefix=<subject prefix> +--subject-prefix=<subject-prefix> </dt> <dd> <p> Instead of the standard <em>[PATCH]</em> prefix in the subject - line, instead use <em>[<subject prefix>]</em>. This can be used + line, instead use <em>[<subject-prefix>]</em>. This can be used to name a patch series, and can be combined with the <code>--numbered</code> option. </p> @@ -2144,7 +2144,7 @@ </dt> <dd> <p> - Treat the revision argument as a <revision range>, even if it + Treat the revision argument as a <revision-range>, even if it is just a single commit (that would normally be treated as a <since>). Note that root commits included in the specified range are always formatted as creation patches, independently @@ -2618,7 +2618,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2023-12-18 14:49:41 PST + 2024-02-08 15:45:59 PST </div> </div> </body>
diff --git a/git-format-patch.txt b/git-format-patch.txt index 414da6b..728bb38 100644 --- a/git-format-patch.txt +++ b/git-format-patch.txt
@@ -17,10 +17,10 @@ [--signature-file=<file>] [-n | --numbered | -N | --no-numbered] [--start-number <n>] [--numbered-files] - [--in-reply-to=<message id>] [--suffix=.<sfx>] + [--in-reply-to=<message-id>] [--suffix=.<sfx>] [--ignore-if-in-upstream] [--always] [--cover-from-description=<mode>] - [--rfc] [--subject-prefix=<subject prefix>] + [--rfc] [--subject-prefix=<subject-prefix>] [(--reroll-count|-v) <n>] [--to=<email>] [--cc=<email>] [--[no-]cover-letter] [--quiet] @@ -30,8 +30,8 @@ [--range-diff=<previous> [--creation-factor=<percent>]] [--filename-max-length=<n>] [--progress] - [<common diff options>] - [ <since> | <revision range> ] + [<common-diff-options>] + [ <since> | <revision-range> ] DESCRIPTION ----------- @@ -64,7 +64,7 @@ to the tip of the current branch that are not in the history that leads to the <since> to be output. -2. Generic <revision range> expression (see "SPECIFYING +2. Generic <revision-range> expression (see "SPECIFYING REVISIONS" section in linkgit:gitrevisions[7]) means the commits in the specified range. @@ -179,9 +179,9 @@ itself. If you want `git format-patch` to take care of threading, you will want to ensure that threading is disabled for `git send-email`. ---in-reply-to=<message id>:: +--in-reply-to=<message-id>:: Make the first mail (or all the mails with `--no-thread`) appear as a - reply to the given <message id>, which avoids breaking threads to + reply to the given <message-id>, which avoids breaking threads to provide a new patch series. --ignore-if-in-upstream:: @@ -219,9 +219,9 @@ Use the contents of <file> instead of the branch's description for generating the cover letter. ---subject-prefix=<subject prefix>:: +--subject-prefix=<subject-prefix>:: Instead of the standard '[PATCH]' prefix in the subject - line, instead use '[<subject prefix>]'. This can be used + line, instead use '[<subject-prefix>]'. This can be used to name a patch series, and can be combined with the `--numbered` option. + @@ -403,7 +403,7 @@ `format.useAutoBase` configuration. --root:: - Treat the revision argument as a <revision range>, even if it + Treat the revision argument as a <revision-range>, even if it is just a single commit (that would normally be treated as a <since>). Note that root commits included in the specified range are always formatted as creation patches, independently
diff --git a/git-index-pack.html b/git-index-pack.html index 5555f40..f50f3b6 100644 --- a/git-index-pack.html +++ b/git-index-pack.html
@@ -865,11 +865,16 @@ </p> </dd> <dt class="hdlist1"> ---strict +--strict[=<msg-id>=<severity>…] </dt> <dd> <p> - Die, if the pack contains broken objects or links. + Die, if the pack contains broken objects or links. An optional + comma-separated list of <code><msg-id>=<severity></code> can be passed to change + the severity of some possible issues, e.g., + <code>--strict="missingEmail=ignore,badTagName=error"</code>. See the entry for the + <code>fsck.<msg-id></code> configuration options in <a href="git-fsck.html">git-fsck(1)</a> for more + information on the possible values of <code><msg-id></code> and <code><severity></code>. </p> </dd> <dt class="hdlist1"> @@ -891,16 +896,21 @@ </p> </dd> <dt class="hdlist1"> ---fsck-objects +--fsck-objects[=<msg-id>=<severity>…] </dt> <dd> <p> - For internal use only. + Die if the pack contains broken objects, but unlike <code>--strict</code>, don’t + choke on broken links. If the pack contains a tree pointing to a + .gitmodules blob that does not exist, prints the hash of that blob + (for the caller to check) after the hash that goes into the name of the + pack/idx file (see "Notes"). </p> -<div class="paragraph"><p>Die if the pack contains broken objects. If the pack contains a tree -pointing to a .gitmodules blob that does not exist, prints the hash of -that blob (for the caller to check) after the hash that goes into the -name of the pack/idx file (see "Notes").</p></div> +<div class="paragraph"><p>An optional comma-separated list of <code><msg-id>=<severity></code> can be passed to +change the severity of some possible issues, e.g., +<code>--fsck-objects="missingEmail=ignore,badTagName=ignore"</code>. See the entry for the +<code>fsck.<msg-id></code> configuration options in <a href="git-fsck.html">git-fsck(1)</a> for more +information on the possible values of <code><msg-id></code> and <code><severity></code>.</p></div> </dd> <dt class="hdlist1"> --threads=<n> @@ -985,7 +995,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2023-10-23 14:43:46 PDT + 2024-02-08 15:45:59 PST </div> </div> </body>
diff --git a/git-index-pack.txt b/git-index-pack.txt index 6486620..5a20dee 100644 --- a/git-index-pack.txt +++ b/git-index-pack.txt
@@ -79,8 +79,13 @@ to force the version for the generated pack index, and to force 64-bit index entries on objects located above the given offset. ---strict:: - Die, if the pack contains broken objects or links. +--strict[=<msg-id>=<severity>...]:: + Die, if the pack contains broken objects or links. An optional + comma-separated list of `<msg-id>=<severity>` can be passed to change + the severity of some possible issues, e.g., + `--strict="missingEmail=ignore,badTagName=error"`. See the entry for the + `fsck.<msg-id>` configuration options in linkgit:git-fsck[1] for more + information on the possible values of `<msg-id>` and `<severity>`. --progress-title:: For internal use only. @@ -91,13 +96,18 @@ --check-self-contained-and-connected:: Die if the pack contains broken links. For internal use only. ---fsck-objects:: - For internal use only. +--fsck-objects[=<msg-id>=<severity>...]:: + Die if the pack contains broken objects, but unlike `--strict`, don't + choke on broken links. If the pack contains a tree pointing to a + .gitmodules blob that does not exist, prints the hash of that blob + (for the caller to check) after the hash that goes into the name of the + pack/idx file (see "Notes"). + -Die if the pack contains broken objects. If the pack contains a tree -pointing to a .gitmodules blob that does not exist, prints the hash of -that blob (for the caller to check) after the hash that goes into the -name of the pack/idx file (see "Notes"). +An optional comma-separated list of `<msg-id>=<severity>` can be passed to +change the severity of some possible issues, e.g., +`--fsck-objects="missingEmail=ignore,badTagName=ignore"`. See the entry for the +`fsck.<msg-id>` configuration options in linkgit:git-fsck[1] for more +information on the possible values of `<msg-id>` and `<severity>`. --threads=<n>:: Specifies the number of threads to spawn when resolving
diff --git a/git-log.html b/git-log.html index bdf1a1a..c2b14a4 100644 --- a/git-log.html +++ b/git-log.html
@@ -4052,7 +4052,7 @@ </dt> <dd> <p> - Synonym for --dirstat=files,param1,param2… + Synonym for --dirstat=files,<param1>,<param2>… </p> </dd> <dt class="hdlist1">
diff --git a/git-mv.html b/git-mv.html index e928ca7..e172edc 100644 --- a/git-mv.html +++ b/git-mv.html
@@ -761,7 +761,7 @@ <div class="literalblock"> <div class="content"> <pre><code>git mv [-v] [-f] [-n] [-k] <source> <destination> -git mv [-v] [-f] [-n] [-k] <source> ... <destination directory></code></pre> +git mv [-v] [-f] [-n] [-k] <source> ... <destination-directory></code></pre> </div></div> <div class="paragraph"><p>In the first form, it renames <source>, which must exist and be either a file, symlink or directory, to <destination>. @@ -857,7 +857,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2023-10-23 14:43:46 PDT + 2024-02-08 15:45:59 PST </div> </div> </body>
diff --git a/git-mv.txt b/git-mv.txt index 7f991a3..dc1bf61 100644 --- a/git-mv.txt +++ b/git-mv.txt
@@ -16,7 +16,7 @@ Move or rename a file, directory, or symlink. git mv [-v] [-f] [-n] [-k] <source> <destination> - git mv [-v] [-f] [-n] [-k] <source> ... <destination directory> + git mv [-v] [-f] [-n] [-k] <source> ... <destination-directory> In the first form, it renames <source>, which must exist and be either a file, symlink or directory, to <destination>.
diff --git a/git-notes.html b/git-notes.html index 849ec4c..686769e 100644 --- a/git-notes.html +++ b/git-notes.html
@@ -800,7 +800,7 @@ <p> List the notes object for a given object. If no object is given, show a list of all note objects and the objects they - annotate (in the format "<note object> <annotated object>"). + annotate (in the format "<note-object> <annotated-object>"). This is the default subcommand if no subcommand is given. </p> </dd> @@ -1396,7 +1396,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2023-08-17 17:18:11 PDT + 2024-02-08 15:45:59 PST </div> </div> </body>
diff --git a/git-notes.txt b/git-notes.txt index f8310e5..c9221a6 100644 --- a/git-notes.txt +++ b/git-notes.txt
@@ -56,7 +56,7 @@ list:: List the notes object for a given object. If no object is given, show a list of all note objects and the objects they - annotate (in the format "<note object> <annotated object>"). + annotate (in the format "<note-object> <annotated-object>"). This is the default subcommand if no subcommand is given. add::
diff --git a/git-pull.html b/git-pull.html index 9619fa5..a3cf053 100644 --- a/git-pull.html +++ b/git-pull.html
@@ -1763,8 +1763,8 @@ configuration section of the form:</p></div> <div class="listingblock"> <div class="content"> -<pre><code> [url "<actual url base>"] - insteadOf = <other url base></code></pre> +<pre><code> [url "<actual-url-base>"] + insteadOf = <other-url-base></code></pre> </div></div> <div class="paragraph"><p>For example, with this:</p></div> <div class="listingblock"> @@ -1779,8 +1779,8 @@ configuration section of the form:</p></div> <div class="listingblock"> <div class="content"> -<pre><code> [url "<actual url base>"] - pushInsteadOf = <other url base></code></pre> +<pre><code> [url "<actual-url-base>"] + pushInsteadOf = <other-url-base></code></pre> </div></div> <div class="paragraph"><p>For example, with this:</p></div> <div class="listingblock">
diff --git a/git-push.html b/git-push.html index 1aeffea..6cd8c75 100644 --- a/git-push.html +++ b/git-push.html
@@ -1429,8 +1429,8 @@ configuration section of the form:</p></div> <div class="listingblock"> <div class="content"> -<pre><code> [url "<actual url base>"] - insteadOf = <other url base></code></pre> +<pre><code> [url "<actual-url-base>"] + insteadOf = <other-url-base></code></pre> </div></div> <div class="paragraph"><p>For example, with this:</p></div> <div class="listingblock"> @@ -1445,8 +1445,8 @@ configuration section of the form:</p></div> <div class="listingblock"> <div class="content"> -<pre><code> [url "<actual url base>"] - pushInsteadOf = <other url base></code></pre> +<pre><code> [url "<actual-url-base>"] + pushInsteadOf = <other-url-base></code></pre> </div></div> <div class="paragraph"><p>For example, with this:</p></div> <div class="listingblock">
diff --git a/git-remote-helpers.html b/git-remote-helpers.html index f155109..2a9ce39 100644 --- a/git-remote-helpers.html +++ b/git-remote-helpers.html
@@ -735,7 +735,7 @@ <body class="article"> <div id="header"> <h1>git-remote-helpers</h1> -<span id="revdate">2024-02-06</span> +<span id="revdate">2024-02-08</span> </div> <div id="content"> <div id="preamble">
diff --git a/git-replace.html b/git-replace.html index a61a626..1202d27 100644 --- a/git-replace.html +++ b/git-replace.html
@@ -903,19 +903,19 @@ <li> <p> <em>short</em>: - <replaced sha1> + <replaced-sha1> </p> </li> <li> <p> <em>medium</em>: - <replaced sha1> → <replacement sha1> + <replaced-sha1> → <replacement-sha1> </p> </li> <li> <p> <em>long</em>: - <replaced sha1> (<replaced type>) → <replacement sha1> (<replacement type>) + <replaced-sha1> (<replaced-type>) → <replacement-sha1> (<replacement-type>) </p> </li> </ul></div> @@ -971,7 +971,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2023-10-23 14:43:46 PDT + 2024-02-08 15:45:59 PST </div> </div> </body>
diff --git a/git-replace.txt b/git-replace.txt index 4f25712..0a65460 100644 --- a/git-replace.txt +++ b/git-replace.txt
@@ -114,11 +114,11 @@ The following formats are available: * 'short': - <replaced sha1> + <replaced-sha1> * 'medium': - <replaced sha1> -> <replacement sha1> + <replaced-sha1> -> <replacement-sha1> * 'long': - <replaced sha1> (<replaced type>) -> <replacement sha1> (<replacement type>) + <replaced-sha1> (<replaced-type>) -> <replacement-sha1> (<replacement-type>) CREATING REPLACEMENT OBJECTS ----------------------------
diff --git a/git-revert.html b/git-revert.html index ad8b3d8..3b2e274 100644 --- a/git-revert.html +++ b/git-revert.html
@@ -941,7 +941,7 @@ <dd> <p> Instead of starting the body of the log message with "This - reverts <full object name of the commit being reverted>.", + reverts <full-object-name-of-the-commit-being-reverted>.", refer to the commit using "--pretty=reference" format (cf. <a href="git-log.html">git-log(1)</a>). The <code>revert.reference</code> configuration variable can be used to enable this option by @@ -1030,7 +1030,7 @@ <em>strongly</em> recommended to explain why the original commit is being reverted. In addition, repeatedly reverting reverts will result in increasingly -unwieldy subject lines, for example <em>Reapply "Reapply "<original subject>""</em>. +unwieldy subject lines, for example <em>Reapply "Reapply "<original-subject>""</em>. Please consider rewording these to be shorter and more unique.</p></div> </div> </div> @@ -1070,7 +1070,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2023-09-14 11:18:26 PDT + 2024-02-08 15:45:59 PST </div> </div> </body>
diff --git a/git-revert.txt b/git-revert.txt index cbe0208..568925d 100644 --- a/git-revert.txt +++ b/git-revert.txt
@@ -116,7 +116,7 @@ --reference:: Instead of starting the body of the log message with "This - reverts <full object name of the commit being reverted>.", + reverts <full-object-name-of-the-commit-being-reverted>.", refer to the commit using "--pretty=reference" format (cf. linkgit:git-log[1]). The `revert.reference` configuration variable can be used to enable this option by @@ -149,7 +149,7 @@ _strongly_ recommended to explain why the original commit is being reverted. In addition, repeatedly reverting reverts will result in increasingly -unwieldy subject lines, for example 'Reapply "Reapply "<original subject>""'. +unwieldy subject lines, for example 'Reapply "Reapply "<original-subject>""'. Please consider rewording these to be shorter and more unique. CONFIGURATION
diff --git a/git-send-email.html b/git-send-email.html index bbcda4e..53c5d23 100644 --- a/git-send-email.html +++ b/git-send-email.html
@@ -750,7 +750,7 @@ <div class="sectionbody"> <div class="verseblock"> <pre class="content"><em>git send-email</em> [<options>] <file|directory>… -<em>git send-email</em> [<options>] <format-patch options> +<em>git send-email</em> [<options>] <format-patch-options> <em>git send-email</em> --dump-aliases</pre> <div class="attribution"> </div></div> @@ -1834,7 +1834,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2023-12-18 14:49:41 PST + 2024-02-08 15:45:59 PST </div> </div> </body>
diff --git a/git-send-email.txt b/git-send-email.txt index 30deb7f..d1ef6a2 100644 --- a/git-send-email.txt +++ b/git-send-email.txt
@@ -10,7 +10,7 @@ -------- [verse] 'git send-email' [<options>] <file|directory>... -'git send-email' [<options>] <format-patch options> +'git send-email' [<options>] <format-patch-options> 'git send-email' --dump-aliases
diff --git a/git-show.html b/git-show.html index 3c83e4a..c92ade2 100644 --- a/git-show.html +++ b/git-show.html
@@ -2507,7 +2507,7 @@ </dt> <dd> <p> - Synonym for --dirstat=files,param1,param2… + Synonym for --dirstat=files,<param1>,<param2>… </p> </dd> <dt class="hdlist1">
diff --git a/git-status.html b/git-status.html index 829aa59..92fb488 100644 --- a/git-status.html +++ b/git-status.html
@@ -1220,7 +1220,7 @@ ------------------------------------------------------------ # branch.oid <commit> | (initial) Current commit. # branch.head <branch> | (detached) Current branch. -# branch.upstream <upstream_branch> If upstream is set. +# branch.upstream <upstream-branch> If upstream is set. # branch.ab +<ahead> -<behind> If upstream is set and the commit is present. ------------------------------------------------------------</code></pre> @@ -1428,7 +1428,7 @@ <li> <p> <code>core.untrackedCache=true</code> and <code>core.fsmonitor=true</code> or - <code>core.fsmonitor=<hook_command_pathname></code> (see + <code>core.fsmonitor=<hook-command-pathname></code> (see <a href="git-update-index.html">git-update-index(1)</a>): enable both the untracked cache and FSMonitor features and only search directories that have been modified since the previous <code>git status</code> command. This @@ -1464,7 +1464,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2023-10-23 14:43:46 PDT + 2024-02-08 15:45:59 PST </div> </div> </body>
diff --git a/git-status.txt b/git-status.txt index 10fecc5..4dbb883 100644 --- a/git-status.txt +++ b/git-status.txt
@@ -309,7 +309,7 @@ ------------------------------------------------------------ # branch.oid <commit> | (initial) Current commit. # branch.head <branch> | (detached) Current branch. -# branch.upstream <upstream_branch> If upstream is set. +# branch.upstream <upstream-branch> If upstream is set. # branch.ab +<ahead> -<behind> If upstream is set and the commit is present. ------------------------------------------------------------ @@ -502,7 +502,7 @@ usually worth the additional size. * `core.untrackedCache=true` and `core.fsmonitor=true` or - `core.fsmonitor=<hook_command_pathname>` (see + `core.fsmonitor=<hook-command-pathname>` (see linkgit:git-update-index[1]): enable both the untracked cache and FSMonitor features and only search directories that have been modified since the previous `git status` command. This
diff --git a/git-submodule.html b/git-submodule.html index 5ca592e..91267e8 100644 --- a/git-submodule.html +++ b/git-submodule.html
@@ -887,7 +887,7 @@ options.</p></div> </dd> <dt class="hdlist1"> -update [--init] [--remote] [-N|--no-fetch] [--[no-]recommend-shallow] [-f|--force] [--checkout|--rebase|--merge] [--reference <repository>] [--depth <depth>] [--recursive] [--jobs <n>] [--[no-]single-branch] [--filter <filter spec>] [--] [<path>…] +update [--init] [--remote] [-N|--no-fetch] [--[no-]recommend-shallow] [-f|--force] [--checkout|--rebase|--merge] [--reference <repository>] [--depth <depth>] [--recursive] [--jobs <n>] [--[no-]single-branch] [--filter <filter-spec>] [--] [<path>…] </dt> <dd> <div class="openblock"> @@ -967,7 +967,7 @@ submodule with the <code>--init</code> option.</p></div> <div class="paragraph"><p>If <code>--recursive</code> is specified, this command will recurse into the registered submodules, and update any nested submodules within.</p></div> -<div class="paragraph"><p>If <code>--filter <filter spec></code> is specified, the given partial clone filter will be +<div class="paragraph"><p>If <code>--filter <filter-spec></code> is specified, the given partial clone filter will be applied to the submodule. See <a href="git-rev-list.html">git-rev-list(1)</a> for details on filter specifications.</p></div> </div></div> @@ -1416,7 +1416,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2023-08-04 12:03:14 PDT + 2024-02-08 15:45:59 PST </div> </div> </body>
diff --git a/git-submodule.txt b/git-submodule.txt index 6957306..ca0347a 100644 --- a/git-submodule.txt +++ b/git-submodule.txt
@@ -136,7 +136,7 @@ that use linkgit:git-rm[1] instead. See linkgit:gitsubmodules[7] for removal options. -update [--init] [--remote] [-N|--no-fetch] [--[no-]recommend-shallow] [-f|--force] [--checkout|--rebase|--merge] [--reference <repository>] [--depth <depth>] [--recursive] [--jobs <n>] [--[no-]single-branch] [--filter <filter spec>] [--] [<path>...]:: +update [--init] [--remote] [-N|--no-fetch] [--[no-]recommend-shallow] [-f|--force] [--checkout|--rebase|--merge] [--reference <repository>] [--depth <depth>] [--recursive] [--jobs <n>] [--[no-]single-branch] [--filter <filter-spec>] [--] [<path>...]:: + -- Update the registered submodules to match what the superproject @@ -185,7 +185,7 @@ If `--recursive` is specified, this command will recurse into the registered submodules, and update any nested submodules within. -If `--filter <filter spec>` is specified, the given partial clone filter will be +If `--filter <filter-spec>` is specified, the given partial clone filter will be applied to the submodule. See linkgit:git-rev-list[1] for details on filter specifications. --
diff --git a/git-svn.html b/git-svn.html index 26baae2..af5049d 100644 --- a/git-svn.html +++ b/git-svn.html
@@ -788,22 +788,22 @@ </p> <div class="dlist"><dl> <dt class="hdlist1"> --T<trunk_subdir> +-T<trunk-subdir> </dt> <dt class="hdlist1"> ---trunk=<trunk_subdir> +--trunk=<trunk-subdir> </dt> <dt class="hdlist1"> --t<tags_subdir> +-t<tags-subdir> </dt> <dt class="hdlist1"> ---tags=<tags_subdir> +--tags=<tags-subdir> </dt> <dt class="hdlist1"> --b<branches_subdir> +-b<branches-subdir> </dt> <dt class="hdlist1"> ---branches=<branches_subdir> +--branches=<branches-subdir> </dt> <dt class="hdlist1"> -s @@ -1994,14 +1994,14 @@ </p> </dd> <dt class="hdlist1"> --R<remote name> +-R<remote-name> </dt> <dt class="hdlist1"> ---svn-remote <remote name> +--svn-remote <remote-name> </dt> <dd> <p> - Specify the [svn-remote "<remote name>"] section to use, + Specify the [svn-remote "<remote-name>"] section to use, this allows SVN multiple repositories to be tracked. Default: "svn" </p> @@ -2514,7 +2514,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2021-12-10 14:52:02 PST + 2024-02-08 15:45:59 PST </div> </div> </body>
diff --git a/git-svn.txt b/git-svn.txt index 4e92308..43c68c2 100644 --- a/git-svn.txt +++ b/git-svn.txt
@@ -37,12 +37,12 @@ argument. Normally this command initializes the current directory. --T<trunk_subdir>;; ---trunk=<trunk_subdir>;; --t<tags_subdir>;; ---tags=<tags_subdir>;; --b<branches_subdir>;; ---branches=<branches_subdir>;; +-T<trunk-subdir>;; +--trunk=<trunk-subdir>;; +-t<tags-subdir>;; +--tags=<tags-subdir>;; +-b<branches-subdir>;; +--branches=<branches-subdir>;; -s;; --stdlayout;; These are optional command-line options for init. Each of @@ -726,9 +726,9 @@ when tracking a single URL. The 'log' and 'dcommit' commands no longer require this switch as an argument. --R<remote name>:: ---svn-remote <remote name>:: - Specify the [svn-remote "<remote name>"] section to use, +-R<remote-name>:: +--svn-remote <remote-name>:: + Specify the [svn-remote "<remote-name>"] section to use, this allows SVN multiple repositories to be tracked. Default: "svn"
diff --git a/git-tag.html b/git-tag.html index 59571e6..00f5cc7 100644 --- a/git-tag.html +++ b/git-tag.html
@@ -1123,7 +1123,7 @@ <div class="listingblock"> <div class="content"> <pre><code>[user] - signingKey = <gpg-key_id></code></pre> + signingKey = <gpg-key-id></code></pre> </div></div> <div class="paragraph"><p><code>pager.tag</code> is only respected when listing tags, i.e., when <code>-l</code> is used or implied. The default is to use a pager. @@ -1367,7 +1367,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2023-06-13 13:57:42 PDT + 2024-02-08 15:45:59 PST </div> </div> </body>
diff --git a/git-tag.txt b/git-tag.txt index d42efb3..5fe519c 100644 --- a/git-tag.txt +++ b/git-tag.txt
@@ -224,7 +224,7 @@ ------------------------------------- [user] - signingKey = <gpg-key_id> + signingKey = <gpg-key-id> ------------------------------------- `pager.tag` is only respected when listing tags, i.e., when `-l` is
diff --git a/git.html b/git.html index 1ef8550..5028c04 100644 --- a/git.html +++ b/git.html
@@ -1053,7 +1053,7 @@ </p> </dd> <dt class="hdlist1"> ---list-cmds=group[,group…] +--list-cmds=<group>[,<group>…] </dt> <dd> <p> @@ -3502,7 +3502,7 @@ of the SID and an optional counter (to avoid filename collisions).</p></div> <div class="paragraph"><p>In addition, if the variable is set to -<code>af_unix:[<socket_type>:]<absolute-pathname></code>, Git will try +<code>af_unix:[<socket-type>:]<absolute-pathname></code>, Git will try to open the path as a Unix Domain Socket. The socket type can be either <code>stream</code> or <code>dgram</code>.</p></div> <div class="paragraph"><p>Unsetting the variable, or setting it to empty, "0" or @@ -3846,7 +3846,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2024-01-16 12:41:37 PST + 2024-02-08 15:45:59 PST </div> </div> </body>
diff --git a/git.txt b/git.txt index da4e8d1..0d25224 100644 --- a/git.txt +++ b/git.txt
@@ -202,7 +202,7 @@ Do not perform optional operations that require locks. This is equivalent to setting the `GIT_OPTIONAL_LOCKS` to `0`. ---list-cmds=group[,group...]:: +--list-cmds=<group>[,<group>...]:: List commands by group. This is an internal/experimental option and may change or be removed in the future. Supported groups are: builtins, parseopt (builtin commands that use @@ -842,7 +842,7 @@ collisions). + In addition, if the variable is set to -`af_unix:[<socket_type>:]<absolute-pathname>`, Git will try +`af_unix:[<socket-type>:]<absolute-pathname>`, Git will try to open the path as a Unix Domain Socket. The socket type can be either `stream` or `dgram`. +
diff --git a/gitdiffcore.html b/gitdiffcore.html index b29f333..1d30313 100644 --- a/gitdiffcore.html +++ b/gitdiffcore.html
@@ -1016,18 +1016,18 @@ <div class="sectionbody"> <div class="paragraph"><p>This transformation limits the set of filepairs to those that change specified strings between the preimage and the postimage in a certain -way. -S<block of text> and -G<regular expression> options are used to +way. -S<block-of-text> and -G<regular-expression> options are used to specify different ways these strings are sought.</p></div> -<div class="paragraph"><p>"-S<block of text>" detects filepairs whose preimage and postimage +<div class="paragraph"><p>"-S<block-of-text>" detects filepairs whose preimage and postimage have different number of occurrences of the specified block of text. By definition, it will not detect in-file moves. Also, when a changeset moves a file wholesale without affecting the interesting string, diffcore-rename kicks in as usual, and <code>-S</code> omits the filepair (since the number of occurrences of that string didn’t change in that rename-detected filepair). When used with <code>--pickaxe-regex</code>, treat -the <block of text> as an extended POSIX regular expression to match, +the <block-of-text> as an extended POSIX regular expression to match, instead of a literal string.</p></div> -<div class="paragraph"><p>"-G<regular expression>" (mnemonic: grep) detects filepairs whose +<div class="paragraph"><p>"-G<regular-expression>" (mnemonic: grep) detects filepairs whose textual diff has an added or a deleted line that matches the given regular expression. This means that it will detect in-file (or what rename-detection considers the same file) moves, which is noise. The @@ -1108,7 +1108,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2023-10-23 14:43:46 PDT + 2024-02-08 15:45:59 PST </div> </div> </body>
diff --git a/gitdiffcore.txt b/gitdiffcore.txt index 3cda2e0..642c512 100644 --- a/gitdiffcore.txt +++ b/gitdiffcore.txt
@@ -245,20 +245,20 @@ This transformation limits the set of filepairs to those that change specified strings between the preimage and the postimage in a certain -way. -S<block of text> and -G<regular expression> options are used to +way. -S<block-of-text> and -G<regular-expression> options are used to specify different ways these strings are sought. -"-S<block of text>" detects filepairs whose preimage and postimage +"-S<block-of-text>" detects filepairs whose preimage and postimage have different number of occurrences of the specified block of text. By definition, it will not detect in-file moves. Also, when a changeset moves a file wholesale without affecting the interesting string, diffcore-rename kicks in as usual, and `-S` omits the filepair (since the number of occurrences of that string didn't change in that rename-detected filepair). When used with `--pickaxe-regex`, treat -the <block of text> as an extended POSIX regular expression to match, +the <block-of-text> as an extended POSIX regular expression to match, instead of a literal string. -"-G<regular expression>" (mnemonic: grep) detects filepairs whose +"-G<regular-expression>" (mnemonic: grep) detects filepairs whose textual diff has an added or a deleted line that matches the given regular expression. This means that it will detect in-file (or what rename-detection considers the same file) moves, which is noise. The
diff --git a/gitformat-index.html b/gitformat-index.html index 940ea0c..558cf0e 100644 --- a/gitformat-index.html +++ b/gitformat-index.html
@@ -1419,8 +1419,8 @@ </p> <div class="literalblock"> <div class="content"> -<pre><code>Hash("TREE" + <binary representation of N> + - "REUC" + <binary representation of M>)</code></pre> +<pre><code>Hash("TREE" + <binary-representation-of-N> + + "REUC" + <binary-representation-of-M>)</code></pre> </div></div> </li> </ul></div> @@ -1493,7 +1493,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2023-02-09 16:57:15 PST + 2024-02-08 15:45:59 PST </div> </div> </body> diff --git a/gitformat-index.txt b/gitformat-index.txt index 0773e5c..145cace 100644 --- a/gitformat-index.txt +++ b/gitformat-index.txt
@@ -386,8 +386,8 @@ long, "REUC" extension that is M-bytes long, followed by "EOIE", then the hash would be: - Hash("TREE" + <binary representation of N> + - "REUC" + <binary representation of M>) + Hash("TREE" + <binary-representation-of-N> + + "REUC" + <binary-representation-of-M>) == Index Entry Offset Table diff --git a/githooks.html b/githooks.html index 6d1777d..b322d8d 100644 --- a/githooks.html +++ b/githooks.html
@@ -945,7 +945,7 @@ input with lines of the form:</p></div> <div class="literalblock"> <div class="content"> -<pre><code><local ref> SP <local object name> SP <remote ref> SP <remote object name> LF</code></pre> +<pre><code><local-ref> SP <local-object-name> SP <remote-ref> SP <remote-object-name> LF</code></pre> </div></div> <div class="paragraph"><p>For instance, if the command <code>git push origin master:foreign</code> were run the hook would receive a line like the following:</p></div> @@ -954,9 +954,9 @@ <pre><code>refs/heads/master 67890 refs/heads/foreign 12345</code></pre> </div></div> <div class="paragraph"><p>although the full object name would be supplied. If the foreign ref does not -yet exist the <code><remote object name></code> will be the all-zeroes object name. If a -ref is to be deleted, the <code><local ref></code> will be supplied as <code>(delete)</code> and the -<code><local object name></code> will be the all-zeroes object name. If the local commit +yet exist the <code><remote-object-name></code> will be the all-zeroes object name. If a +ref is to be deleted, the <code><local-ref></code> will be supplied as <code>(delete)</code> and the +<code><local-object-name></code> will be the all-zeroes object name. If the local commit was specified by something other than a name which could be expanded (such as <code>HEAD~</code>, or an object name) it will be supplied as it was originally given.</p></div> <div class="paragraph"><p>If this hook exits with a non-zero status, <code>git push</code> will abort without @@ -1442,7 +1442,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2023-10-23 14:43:46 PDT + 2024-02-08 15:45:59 PST </div> </div> </body>
diff --git a/githooks.txt b/githooks.txt index 883982e..37f91d5 100644 --- a/githooks.txt +++ b/githooks.txt
@@ -243,7 +243,7 @@ Information about what is to be pushed is provided on the hook's standard input with lines of the form: - <local ref> SP <local object name> SP <remote ref> SP <remote object name> LF + <local-ref> SP <local-object-name> SP <remote-ref> SP <remote-object-name> LF For instance, if the command +git push origin master:foreign+ were run the hook would receive a line like the following: @@ -251,9 +251,9 @@ refs/heads/master 67890 refs/heads/foreign 12345 although the full object name would be supplied. If the foreign ref does not -yet exist the `<remote object name>` will be the all-zeroes object name. If a -ref is to be deleted, the `<local ref>` will be supplied as `(delete)` and the -`<local object name>` will be the all-zeroes object name. If the local commit +yet exist the `<remote-object-name>` will be the all-zeroes object name. If a +ref is to be deleted, the `<local-ref>` will be supplied as `(delete)` and the +`<local-object-name>` will be the all-zeroes object name. If the local commit was specified by something other than a name which could be expanded (such as `HEAD~`, or an object name) it will be supplied as it was originally given.
diff --git a/gitk.html b/gitk.html index a60354d..b808705 100644 --- a/gitk.html +++ b/gitk.html
@@ -749,7 +749,7 @@ <h2 id="_synopsis">SYNOPSIS</h2> <div class="sectionbody"> <div class="verseblock"> -<pre class="content"><em>gitk</em> [<options>] [<revision range>] [--] [<path>…]</pre> +<pre class="content"><em>gitk</em> [<options>] [<revision-range>] [--] [<path>…]</pre> <div class="attribution"> </div></div> </div> @@ -978,7 +978,7 @@ range to show. The command is expected to print on its standard output a list of additional revisions to be shown, one per line. Use this instead of explicitly specifying a - <em><revision range></em> if the set of commits to show may vary + <em><revision-range></em> if the set of commits to show may vary between refreshes. </p> </dd> @@ -1101,7 +1101,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2023-10-29 16:42:00 PDT + 2024-02-08 15:45:59 PST </div> </div> </body>
diff --git a/gitk.txt b/gitk.txt index c2213bb..35b3996 100644 --- a/gitk.txt +++ b/gitk.txt
@@ -8,7 +8,7 @@ SYNOPSIS -------- [verse] -'gitk' [<options>] [<revision range>] [--] [<path>...] +'gitk' [<options>] [<revision-range>] [--] [<path>...] DESCRIPTION ----------- @@ -124,7 +124,7 @@ range to show. The command is expected to print on its standard output a list of additional revisions to be shown, one per line. Use this instead of explicitly specifying a - '<revision range>' if the set of commits to show may vary + '<revision-range>' if the set of commits to show may vary between refreshes. --select-commit=<ref>::
diff --git a/gitprotocol-capabilities.html b/gitprotocol-capabilities.html index 3b4d5de..f1c1c21 100644 --- a/gitprotocol-capabilities.html +++ b/gitprotocol-capabilities.html
@@ -1131,7 +1131,7 @@ </div> </div> <div class="sect1"> -<h2 id="_session_id_lt_session_id_gt">session-id=<session id></h2> +<h2 id="_session_id_lt_session_id_gt">session-id=<session-id></h2> <div class="sectionbody"> <div class="paragraph"><p>The server may advertise a session ID that can be used to identify this process across multiple requests. The client may advertise its own session ID back to @@ -1154,7 +1154,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2023-10-23 14:43:46 PDT + 2024-02-08 15:45:59 PST </div> </div> </body>
diff --git a/gitprotocol-capabilities.txt b/gitprotocol-capabilities.txt index d6c6eff..2cf7735 100644 --- a/gitprotocol-capabilities.txt +++ b/gitprotocol-capabilities.txt
@@ -378,7 +378,7 @@ or partial fetch and request that the server omit various objects from the packfile. -session-id=<session id> +session-id=<session-id> ----------------------- The server may advertise a session ID that can be used to identify this process
diff --git a/gitprotocol-http.html b/gitprotocol-http.html index 90e7dac..f02bc77 100644 --- a/gitprotocol-http.html +++ b/gitprotocol-http.html
@@ -1119,14 +1119,14 @@ <div class="paragraph"><p>C: Send one <code>$GIT_URL/git-upload-pack</code> request:</p></div> <div class="literalblock"> <div class="content"> -<pre><code>C: 0032want <want #1>............................... -C: 0032want <want #2>............................... +<pre><code>C: 0032want <want-#1>............................... +C: 0032want <want-#2>............................... .... -C: 0032have <common #1>............................. -C: 0032have <common #2>............................. +C: 0032have <common-#1>............................. +C: 0032have <common-#2>............................. .... -C: 0032have <have #1>............................... -C: 0032have <have #2>............................... +C: 0032have <have-#1>............................... +C: 0032have <have-#2>............................... .... C: 0000</code></pre> </div></div> @@ -1235,7 +1235,7 @@ <div class="literalblock"> <div class="content"> <pre><code>update_request = command_list - "PACK" <binary data></code></pre> + "PACK" <binary-data></code></pre> </div></div> <div class="literalblock"> <div class="content"> @@ -1279,7 +1279,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2023-12-18 14:49:41 PST + 2024-02-08 15:45:59 PST </div> </div> </body>
diff --git a/gitprotocol-http.txt b/gitprotocol-http.txt index 836b349..ec40a55 100644 --- a/gitprotocol-http.txt +++ b/gitprotocol-http.txt
@@ -391,14 +391,14 @@ C: Send one `$GIT_URL/git-upload-pack` request: - C: 0032want <want #1>............................... - C: 0032want <want #2>............................... + C: 0032want <want-#1>............................... + C: 0032want <want-#2>............................... .... - C: 0032have <common #1>............................. - C: 0032have <common #2>............................. + C: 0032have <common-#1>............................. + C: 0032have <common-#2>............................. .... - C: 0032have <have #1>............................... - C: 0032have <have #2>............................... + C: 0032have <have-#1>............................... + C: 0032have <have-#2>............................... .... C: 0000 @@ -512,7 +512,7 @@ the id obtained through ref discovery as old_id. update_request = command_list - "PACK" <binary data> + "PACK" <binary-data> command_list = PKT-LINE(command NUL cap_list LF) *(command_pkt)
diff --git a/gitprotocol-v2.html b/gitprotocol-v2.html index 7080f39..2513d3a 100644 --- a/gitprotocol-v2.html +++ b/gitprotocol-v2.html
@@ -986,7 +986,7 @@ which can be used to limit the refs sent from the server.</p></div> <div class="paragraph"><p>Additional features not supported in the base command will be advertised as the value of the command in the capability advertisement in the form -of a space separated list of features: "<command>=<feature 1> <feature 2>"</p></div> +of a space separated list of features: "<command>=<feature-1> <feature-2>"</p></div> <div class="paragraph"><p>ls-refs takes in the following arguments:</p></div> <div class="literalblock"> <div class="content"> @@ -1033,7 +1033,7 @@ addition of future extensions.</p></div> <div class="paragraph"><p>Additional features not supported in the base command will be advertised as the value of the command in the capability advertisement in the form -of a space separated list of features: "<command>=<feature 1> <feature 2>"</p></div> +of a space separated list of features: "<command>=<feature-1> <feature-2>"</p></div> <div class="paragraph"><p>A <code>fetch</code> request can take the following arguments:</p></div> <div class="literalblock"> <div class="content"> @@ -1176,7 +1176,7 @@ explained below.</p></div> <div class="literalblock"> <div class="content"> -<pre><code>packfile-uris <comma-separated list of protocols> +<pre><code>packfile-uris <comma-separated-list-of-protocols> Indicates to the server that the client is willing to receive URIs of any of the given protocols in place of objects in the sent packfile. Before performing the connectivity check, the @@ -1432,7 +1432,7 @@ SHA-1, it should specify its object-format string.</p></div> </div> <div class="sect2"> -<h3 id="_session_id_lt_session_id_gt">session-id=<session id></h3> +<h3 id="_session_id_lt_session_id_gt">session-id=<session-id></h3> <div class="paragraph"><p>The server may advertise a session ID that can be used to identify this process across multiple requests. The client may advertise its own session ID back to the server as well.</p></div> @@ -1719,7 +1719,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2023-10-23 14:43:46 PDT + 2024-02-08 15:45:59 PST </div> </div> </body>
diff --git a/gitprotocol-v2.txt b/gitprotocol-v2.txt index 8c1e7c6..0b800ab 100644 --- a/gitprotocol-v2.txt +++ b/gitprotocol-v2.txt
@@ -199,7 +199,7 @@ Additional features not supported in the base command will be advertised as the value of the command in the capability advertisement in the form -of a space separated list of features: "<command>=<feature 1> <feature 2>" +of a space separated list of features: "<command>=<feature-1> <feature-2>" ls-refs takes in the following arguments: @@ -245,7 +245,7 @@ Additional features not supported in the base command will be advertised as the value of the command in the capability advertisement in the form -of a space separated list of features: "<command>=<feature 1> <feature 2>" +of a space separated list of features: "<command>=<feature-1> <feature-2>" A `fetch` request can take the following arguments: @@ -363,7 +363,7 @@ addition of the 'packfile-uris' section in the server's response as explained below. - packfile-uris <comma-separated list of protocols> + packfile-uris <comma-separated-list-of-protocols> Indicates to the server that the client is willing to receive URIs of any of the given protocols in place of objects in the sent packfile. Before performing the connectivity check, the @@ -534,7 +534,7 @@ only handle SHA-1. If the client would like to use a hash algorithm other than SHA-1, it should specify its object-format string. -session-id=<session id> +session-id=<session-id> ~~~~~~~~~~~~~~~~~~~~~~~ The server may advertise a session ID that can be used to identify this process
diff --git a/gitsubmodules.html b/gitsubmodules.html index f125266..af6727e 100644 --- a/gitsubmodules.html +++ b/gitsubmodules.html
@@ -932,7 +932,7 @@ <li> <p> Deleted submodule: A submodule can be deleted by running -<code>git rm <submodule path> && git commit</code>. This can be undone +<code>git rm <submodule-path> && git commit</code>. This can be undone using <code>git revert</code>. </p> <div class="paragraph"><p>The deletion removes the superproject’s tracking data, which are @@ -1025,7 +1025,7 @@ <div class="literalblock"> <div class="content"> <pre><code># Occasionally update the submodule to a new version: -git -C <path> checkout <new version> +git -C <path> checkout <new-version> git add <path> git commit -m "update submodule to new version"</code></pre> </div></div> @@ -1113,7 +1113,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2023-10-23 14:43:46 PDT + 2024-02-08 15:45:59 PST </div> </div> </body>
diff --git a/gitsubmodules.txt b/gitsubmodules.txt index 8400d59..f7b5a25 100644 --- a/gitsubmodules.txt +++ b/gitsubmodules.txt
@@ -151,7 +151,7 @@ is not affected. This can be undone using `git submodule init`. * Deleted submodule: A submodule can be deleted by running -`git rm <submodule path> && git commit`. This can be undone +`git rm <submodule-path> && git commit`. This can be undone using `git revert`. + The deletion removes the superproject's tracking data, which are @@ -229,7 +229,7 @@ git submodule add <URL> <path> # Occasionally update the submodule to a new version: - git -C <path> checkout <new version> + git -C <path> checkout <new-version> git add <path> git commit -m "update submodule to new version"
diff --git a/gitweb.conf.html b/gitweb.conf.html index fb81c89..19040af 100644 --- a/gitweb.conf.html +++ b/gitweb.conf.html
@@ -1140,7 +1140,7 @@ Label for the "home link" at the top of all pages, leading to <code>$home_link</code> (usually the main gitweb page, which contains the projects list). It is used as the first component of gitweb’s "breadcrumb trail": - <code><home link> / <project> / <action></code>. Can be set at build time using + <code><home-link> / <project> / <action></code>. Can be set at build time using the <code>GITWEB_HOME_LINK_STR</code> variable. By default it is set to "projects", as this link leads to the list of projects. Another popular choice is to set it to the name of site. Note that it is treated as raw HTML so it @@ -1522,9 +1522,9 @@ structure:</p></div> <div class="listingblock"> <div class="content"> -<pre><code>"<feature_name>" => { - "sub" => <feature-sub (subroutine)>, - "override" => <allow-override (boolean)>, +<pre><code>"<feature-name>" => { + "sub" => <feature-sub-(subroutine)>, + "override" => <allow-override-(boolean)>, "default" => [ <options>... ] },</code></pre> </div></div> @@ -1533,7 +1533,7 @@ form:</p></div> <div class="listingblock"> <div class="content"> -<pre><code>"<feature_name>" => { +<pre><code>"<feature-name>" => { "override" => 0, "default" => [ <options>... ] },</code></pre> @@ -2015,7 +2015,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2023-12-18 14:49:41 PST + 2024-02-08 15:45:59 PST </div> </div> </body> diff --git a/gitweb.conf.txt b/gitweb.conf.txt index 59fc1d2..8598358 100644 --- a/gitweb.conf.txt +++ b/gitweb.conf.txt
@@ -343,7 +343,7 @@ Label for the "home link" at the top of all pages, leading to `$home_link` (usually the main gitweb page, which contains the projects list). It is used as the first component of gitweb's "breadcrumb trail": - `<home link> / <project> / <action>`. Can be set at build time using + `<home-link> / <project> / <action>`. Can be set at build time using the `GITWEB_HOME_LINK_STR` variable. By default it is set to "projects", as this link leads to the list of projects. Another popular choice is to set it to the name of site. Note that it is treated as raw HTML so it @@ -604,9 +604,9 @@ Each `%feature` hash element is a hash reference and has the following structure: ---------------------------------------------------------------------- -"<feature_name>" => { - "sub" => <feature-sub (subroutine)>, - "override" => <allow-override (boolean)>, +"<feature-name>" => { + "sub" => <feature-sub-(subroutine)>, + "override" => <allow-override-(boolean)>, "default" => [ <options>... ] }, ---------------------------------------------------------------------- @@ -614,7 +614,7 @@ features the structure of appropriate `%feature` hash element has a simpler form: ---------------------------------------------------------------------- -"<feature_name>" => { +"<feature-name>" => { "override" => 0, "default" => [ <options>... ] }, diff --git a/gitweb.html b/gitweb.html index ad20864..38ef6ff 100644 --- a/gitweb.html +++ b/gitweb.html
@@ -1158,7 +1158,7 @@ looks like this:</p></div> <div class="listingblock"> <div class="content"> -<pre><code>.../gitweb.cgi/<repo>/<action>/<revision_from>:/<path_from>..<revision_to>:/<path_to>?<arguments></code></pre> +<pre><code>.../gitweb.cgi/<repo>/<action>/<revision-from>:/<path-from>..<revision-to>:/<path-to>?<arguments></code></pre> </div></div> <div class="paragraph"><p>Each action is implemented as a subroutine, and must be present in %actions hash. Some actions are disabled by default, and must be turned on via feature @@ -1642,7 +1642,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2023-12-18 14:49:41 PST + 2024-02-08 15:45:59 PST </div> </div> </body>
diff --git a/gitweb.txt b/gitweb.txt index ddd4a0f..56d24a3 100644 --- a/gitweb.txt +++ b/gitweb.txt
@@ -305,7 +305,7 @@ looks like this: ----------------------------------------------------------------------- -.../gitweb.cgi/<repo>/<action>/<revision_from>:/<path_from>..<revision_to>:/<path_to>?<arguments> +.../gitweb.cgi/<repo>/<action>/<revision-from>:/<path-from>..<revision-to>:/<path-to>?<arguments> -----------------------------------------------------------------------
diff --git a/howto/coordinate-embargoed-releases.html b/howto/coordinate-embargoed-releases.html index 4afe002..8c3cda3 100644 --- a/howto/coordinate-embargoed-releases.html +++ b/howto/coordinate-embargoed-releases.html
@@ -1038,7 +1038,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2024-02-06 15:01:54 PST + 2024-02-08 15:46:37 PST </div> </div> </body>
diff --git a/howto/keep-canonical-history-correct.html b/howto/keep-canonical-history-correct.html index 820380d..2475a92 100644 --- a/howto/keep-canonical-history-correct.html +++ b/howto/keep-canonical-history-correct.html
@@ -735,7 +735,7 @@ <body class="article"> <div id="header"> <h1>Keep authoritative canonical history correct with git pull</h1> -<span id="revdate">2024-02-06</span> +<span id="revdate">2024-02-08</span> </div> <div id="content"> <div id="preamble"> @@ -939,7 +939,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2024-02-06 15:01:54 PST + 2024-02-08 15:46:36 PST </div> </div> </body>
diff --git a/howto/maintain-git.html b/howto/maintain-git.html index 524cca8..eeae362 100644 --- a/howto/maintain-git.html +++ b/howto/maintain-git.html
@@ -735,7 +735,7 @@ <body class="article"> <div id="header"> <h1>How to maintain Git</h1> -<span id="revdate">2024-02-06</span> +<span id="revdate">2024-02-08</span> </div> <div id="content"> <div class="sect1"> @@ -1479,7 +1479,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2024-02-06 15:01:54 PST + 2024-02-08 15:46:36 PST </div> </div> </body>
diff --git a/howto/new-command.html b/howto/new-command.html index f47fe0d..ebd0294 100644 --- a/howto/new-command.html +++ b/howto/new-command.html
@@ -735,7 +735,7 @@ <body class="article"> <div id="header"> <h1>How to integrate new subcommands</h1> -<span id="revdate">2024-02-06</span> +<span id="revdate">2024-02-08</span> </div> <div id="content"> <div id="preamble"> @@ -864,7 +864,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2024-02-06 15:01:53 PST + 2024-02-08 15:46:34 PST </div> </div> </body>
diff --git a/howto/rebase-from-internal-branch.html b/howto/rebase-from-internal-branch.html index 21f1aab..6cec363 100644 --- a/howto/rebase-from-internal-branch.html +++ b/howto/rebase-from-internal-branch.html
@@ -735,7 +735,7 @@ <body class="article"> <div id="header"> <h1>How to rebase from an internal branch</h1> -<span id="revdate">2024-02-06</span> +<span id="revdate">2024-02-08</span> </div> <div id="content"> <div id="preamble"> @@ -896,7 +896,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2024-02-06 15:01:54 PST + 2024-02-08 15:46:36 PST </div> </div> </body>
diff --git a/howto/rebuild-from-update-hook.html b/howto/rebuild-from-update-hook.html index 308562b..a2cc275 100644 --- a/howto/rebuild-from-update-hook.html +++ b/howto/rebuild-from-update-hook.html
@@ -735,7 +735,7 @@ <body class="article"> <div id="header"> <h1>How to rebuild from update hook</h1> -<span id="revdate">2024-02-06</span> +<span id="revdate">2024-02-08</span> </div> <div id="content"> <div id="preamble"> @@ -848,7 +848,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2024-02-06 15:01:54 PST + 2024-02-08 15:46:36 PST </div> </div> </body>
diff --git a/howto/recover-corrupted-blob-object.html b/howto/recover-corrupted-blob-object.html index 2f292d1..e36c1e1 100644 --- a/howto/recover-corrupted-blob-object.html +++ b/howto/recover-corrupted-blob-object.html
@@ -735,7 +735,7 @@ <body class="article"> <div id="header"> <h1>How to recover a corrupted blob object</h1> -<span id="revdate">2024-02-06</span> +<span id="revdate">2024-02-08</span> </div> <div id="content"> <div id="preamble"> @@ -881,7 +881,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2024-02-06 15:01:54 PST + 2024-02-08 15:46:36 PST </div> </div> </body>
diff --git a/howto/recover-corrupted-object-harder.html b/howto/recover-corrupted-object-harder.html index 4ad512d..ab5fba0 100644 --- a/howto/recover-corrupted-object-harder.html +++ b/howto/recover-corrupted-object-harder.html
@@ -735,7 +735,7 @@ <body class="article"> <div id="header"> <h1>How to recover an object from scratch</h1> -<span id="revdate">2024-02-06</span> +<span id="revdate">2024-02-08</span> </div> <div id="content"> <div id="preamble"> @@ -1190,7 +1190,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2024-02-06 15:01:54 PST + 2024-02-08 15:46:36 PST </div> </div> </body>
diff --git a/howto/revert-a-faulty-merge.html b/howto/revert-a-faulty-merge.html index 359bd7d..eb4303c 100644 --- a/howto/revert-a-faulty-merge.html +++ b/howto/revert-a-faulty-merge.html
@@ -735,7 +735,7 @@ <body class="article"> <div id="header"> <h1>How to revert a faulty merge</h1> -<span id="revdate">2024-02-06</span> +<span id="revdate">2024-02-08</span> </div> <div id="content"> <div id="preamble"> @@ -1026,7 +1026,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2024-02-06 15:01:54 PST + 2024-02-08 15:46:36 PST </div> </div> </body>
diff --git a/howto/revert-branch-rebase.html b/howto/revert-branch-rebase.html index 0dea874..7b7ec84 100644 --- a/howto/revert-branch-rebase.html +++ b/howto/revert-branch-rebase.html
@@ -735,7 +735,7 @@ <body class="article"> <div id="header"> <h1>How to revert an existing commit</h1> -<span id="revdate">2024-02-06</span> +<span id="revdate">2024-02-08</span> </div> <div id="content"> <div id="preamble"> @@ -908,7 +908,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2024-02-06 15:01:53 PST + 2024-02-08 15:46:34 PST </div> </div> </body>
diff --git a/howto/separating-topic-branches.html b/howto/separating-topic-branches.html index e143f82..d5b5de6 100644 --- a/howto/separating-topic-branches.html +++ b/howto/separating-topic-branches.html
@@ -735,7 +735,7 @@ <body class="article"> <div id="header"> <h1>How to separate topic branches</h1> -<span id="revdate">2024-02-06</span> +<span id="revdate">2024-02-08</span> </div> <div id="content"> <div id="preamble"> @@ -842,7 +842,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2024-02-06 15:01:54 PST + 2024-02-08 15:46:36 PST </div> </div> </body>
diff --git a/howto/setup-git-server-over-http.html b/howto/setup-git-server-over-http.html index 24ad212..8df1185 100644 --- a/howto/setup-git-server-over-http.html +++ b/howto/setup-git-server-over-http.html
@@ -735,7 +735,7 @@ <body class="article"> <div id="header"> <h1>How to setup Git server over http</h1> -<span id="revdate">2024-02-06</span> +<span id="revdate">2024-02-08</span> </div> <div id="content"> <div id="preamble"> @@ -1072,7 +1072,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2024-02-06 15:01:54 PST + 2024-02-08 15:46:35 PST </div> </div> </body>
diff --git a/howto/update-hook-example.html b/howto/update-hook-example.html index f3e59ef..a2938c8 100644 --- a/howto/update-hook-example.html +++ b/howto/update-hook-example.html
@@ -735,7 +735,7 @@ <body class="article"> <div id="header"> <h1>How to use the update hook</h1> -<span id="revdate">2024-02-06</span> +<span id="revdate">2024-02-08</span> </div> <div id="content"> <div id="preamble"> @@ -931,7 +931,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2024-02-06 15:01:54 PST + 2024-02-08 15:46:35 PST </div> </div> </body>
diff --git a/howto/use-git-daemon.html b/howto/use-git-daemon.html index 4a5e62a..69815ea 100644 --- a/howto/use-git-daemon.html +++ b/howto/use-git-daemon.html
@@ -735,7 +735,7 @@ <body class="article"> <div id="header"> <h1>How to use git-daemon</h1> -<span id="revdate">2024-02-06</span> +<span id="revdate">2024-02-08</span> </div> <div id="content"> <div id="preamble"> @@ -792,7 +792,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2024-02-06 15:01:53 PST + 2024-02-08 15:46:35 PST </div> </div> </body>
diff --git a/howto/using-merge-subtree.html b/howto/using-merge-subtree.html index 30a4399..4c78d8a 100644 --- a/howto/using-merge-subtree.html +++ b/howto/using-merge-subtree.html
@@ -735,7 +735,7 @@ <body class="article"> <div id="header"> <h1>How to use the subtree merge strategy</h1> -<span id="revdate">2024-02-06</span> +<span id="revdate">2024-02-08</span> </div> <div id="content"> <div id="preamble"> @@ -849,7 +849,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2024-02-06 15:01:53 PST + 2024-02-08 15:46:35 PST </div> </div> </body>
diff --git a/howto/using-signed-tag-in-pull-request.html b/howto/using-signed-tag-in-pull-request.html index 21ebc39..74d15ef 100644 --- a/howto/using-signed-tag-in-pull-request.html +++ b/howto/using-signed-tag-in-pull-request.html
@@ -735,7 +735,7 @@ <body class="article"> <div id="header"> <h1>How to use a signed tag in pull requests</h1> -<span id="revdate">2024-02-06</span> +<span id="revdate">2024-02-08</span> </div> <div id="content"> <div id="preamble"> @@ -953,7 +953,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2024-02-06 15:01:53 PST + 2024-02-08 15:46:35 PST </div> </div> </body>
diff --git a/technical/api-error-handling.html b/technical/api-error-handling.html index a6ed401..a4f0793 100644 --- a/technical/api-error-handling.html +++ b/technical/api-error-handling.html
@@ -735,7 +735,7 @@ <body class="article"> <div id="header"> <h1>Error reporting in git</h1> -<span id="revdate">2024-02-06</span> +<span id="revdate">2024-02-08</span> </div> <div id="content"> <div id="preamble">
diff --git a/technical/api-index.html b/technical/api-index.html index 3229315..fae733c 100644 --- a/technical/api-index.html +++ b/technical/api-index.html
@@ -735,7 +735,7 @@ <body class="article"> <div id="header"> <h1>Git API Documents</h1> -<span id="revdate">2024-02-06</span> +<span id="revdate">2024-02-08</span> </div> <div id="content"> <div id="preamble">
diff --git a/technical/api-merge.html b/technical/api-merge.html index 7373bc3..b448eb0 100644 --- a/technical/api-merge.html +++ b/technical/api-merge.html
@@ -735,7 +735,7 @@ <body class="article"> <div id="header"> <h1>merge API</h1> -<span id="revdate">2024-02-06</span> +<span id="revdate">2024-02-08</span> </div> <div id="content"> <div id="preamble">
diff --git a/technical/api-parse-options.html b/technical/api-parse-options.html index 5ffcc3e..051f2f0 100644 --- a/technical/api-parse-options.html +++ b/technical/api-parse-options.html
@@ -735,7 +735,7 @@ <body class="article"> <div id="header"> <h1>parse-options API</h1> -<span id="revdate">2024-02-06</span> +<span id="revdate">2024-02-08</span> </div> <div id="content"> <div id="preamble">
diff --git a/technical/api-simple-ipc.html b/technical/api-simple-ipc.html index 40fb111..1db3da6 100644 --- a/technical/api-simple-ipc.html +++ b/technical/api-simple-ipc.html
@@ -735,7 +735,7 @@ <body class="article"> <div id="header"> <h1>Simple-IPC API</h1> -<span id="revdate">2024-02-06</span> +<span id="revdate">2024-02-08</span> </div> <div id="content"> <div id="preamble">
diff --git a/technical/api-trace2.html b/technical/api-trace2.html index 582af69..610bdc4 100644 --- a/technical/api-trace2.html +++ b/technical/api-trace2.html
@@ -735,7 +735,7 @@ <body class="article"> <div id="header"> <h1>Trace2 API</h1> -<span id="revdate">2024-02-06</span> +<span id="revdate">2024-02-08</span> </div> <div id="content"> <div id="preamble"> @@ -893,7 +893,7 @@ </li> <li> <p> -<code>af_unix:[<socket_type>:]<absolute-pathname></code> - Write to a +<code>af_unix:[<socket-type>:]<absolute-pathname></code> - Write to a Unix DomainSocket (on platforms that support them). Socket type can be either <code>stream</code> or <code>dgram</code>; if omitted Git will try both.
diff --git a/technical/bitmap-format.html b/technical/bitmap-format.html index e3dc1dc..382b8cf 100644 --- a/technical/bitmap-format.html +++ b/technical/bitmap-format.html
@@ -735,7 +735,7 @@ <body class="article"> <div id="header"> <h1>GIT bitmap v1 format</h1> -<span id="revdate">2024-02-06</span> +<span id="revdate">2024-02-08</span> </div> <div id="content"> <div class="sect1">
diff --git a/technical/bundle-uri.html b/technical/bundle-uri.html index 471c987..17699cc 100644 --- a/technical/bundle-uri.html +++ b/technical/bundle-uri.html
@@ -735,7 +735,7 @@ <body class="article"> <div id="header"> <h1>Bundle URIs</h1> -<span id="revdate">2024-02-06</span> +<span id="revdate">2024-02-08</span> </div> <div id="content"> <div id="preamble">
diff --git a/technical/hash-function-transition.html b/technical/hash-function-transition.html index b8463bc..a5a07e2 100644 --- a/technical/hash-function-transition.html +++ b/technical/hash-function-transition.html
@@ -735,7 +735,7 @@ <body class="article"> <div id="header"> <h1>Git hash function transition</h1> -<span id="revdate">2024-02-06</span> +<span id="revdate">2024-02-08</span> </div> <div id="content"> <div class="sect1">
diff --git a/technical/long-running-process-protocol.html b/technical/long-running-process-protocol.html index 5de827c..f1296fb 100644 --- a/technical/long-running-process-protocol.html +++ b/technical/long-running-process-protocol.html
@@ -735,7 +735,7 @@ <body class="article"> <div id="header"> <h1>Long-running process protocol</h1> -<span id="revdate">2024-02-06</span> +<span id="revdate">2024-02-08</span> </div> <div id="content"> <div id="preamble">
diff --git a/technical/multi-pack-index.html b/technical/multi-pack-index.html index 98acb15..6aa8c17 100644 --- a/technical/multi-pack-index.html +++ b/technical/multi-pack-index.html
@@ -735,7 +735,7 @@ <body class="article"> <div id="header"> <h1>Multi-Pack-Index (MIDX) Design Notes</h1> -<span id="revdate">2024-02-06</span> +<span id="revdate">2024-02-08</span> </div> <div id="content"> <div id="preamble">
diff --git a/technical/pack-heuristics.html b/technical/pack-heuristics.html index 557b1cd..43b5be3 100644 --- a/technical/pack-heuristics.html +++ b/technical/pack-heuristics.html
@@ -735,7 +735,7 @@ <body class="article"> <div id="header"> <h1>Concerning Git’s Packing Heuristics</h1> -<span id="revdate">2024-02-06</span> +<span id="revdate">2024-02-08</span> </div> <div id="content"> <div id="preamble">
diff --git a/technical/parallel-checkout.html b/technical/parallel-checkout.html index 230eb40..dfdbb4c 100644 --- a/technical/parallel-checkout.html +++ b/technical/parallel-checkout.html
@@ -735,7 +735,7 @@ <body class="article"> <div id="header"> <h1>Parallel Checkout Design Notes</h1> -<span id="revdate">2024-02-06</span> +<span id="revdate">2024-02-08</span> </div> <div id="content"> <div id="preamble">
diff --git a/technical/partial-clone.html b/technical/partial-clone.html index 2867610..03c88f7 100644 --- a/technical/partial-clone.html +++ b/technical/partial-clone.html
@@ -735,7 +735,7 @@ <body class="article"> <div id="header"> <h1>Partial Clone Design Notes</h1> -<span id="revdate">2024-02-06</span> +<span id="revdate">2024-02-08</span> </div> <div id="content"> <div id="preamble">
diff --git a/technical/racy-git.html b/technical/racy-git.html index f68410b..51b0b56 100644 --- a/technical/racy-git.html +++ b/technical/racy-git.html
@@ -735,7 +735,7 @@ <body class="article"> <div id="header"> <h1>Use of index and Racy Git problem</h1> -<span id="revdate">2024-02-06</span> +<span id="revdate">2024-02-08</span> </div> <div id="content"> <div class="sect1">
diff --git a/technical/scalar.html b/technical/scalar.html index 62a30e7..4a3aff1 100644 --- a/technical/scalar.html +++ b/technical/scalar.html
@@ -735,7 +735,7 @@ <body class="article"> <div id="header"> <h1>Scalar</h1> -<span id="revdate">2024-02-06</span> +<span id="revdate">2024-02-08</span> </div> <div id="content"> <div id="preamble">
diff --git a/technical/send-pack-pipeline.html b/technical/send-pack-pipeline.html index c985b04..d1684be 100644 --- a/technical/send-pack-pipeline.html +++ b/technical/send-pack-pipeline.html
@@ -735,7 +735,7 @@ <body class="article"> <div id="header"> <h1>Git-send-pack internals</h1> -<span id="revdate">2024-02-06</span> +<span id="revdate">2024-02-08</span> </div> <div id="content"> <div class="sect1">
diff --git a/technical/shallow.html b/technical/shallow.html index c37f957..45a93d9 100644 --- a/technical/shallow.html +++ b/technical/shallow.html
@@ -735,7 +735,7 @@ <body class="article"> <div id="header"> <h1>Shallow commits</h1> -<span id="revdate">2024-02-06</span> +<span id="revdate">2024-02-08</span> </div> <div id="content"> <div id="preamble">
diff --git a/technical/trivial-merge.html b/technical/trivial-merge.html index 1108b0b..fcc61b3 100644 --- a/technical/trivial-merge.html +++ b/technical/trivial-merge.html
@@ -735,7 +735,7 @@ <body class="article"> <div id="header"> <h1>Trivial merge rules</h1> -<span id="revdate">2024-02-06</span> +<span id="revdate">2024-02-08</span> </div> <div id="content"> <div id="preamble">
diff --git a/technical/unit-tests.html b/technical/unit-tests.html index 0e3e78c..9c297b5 100644 --- a/technical/unit-tests.html +++ b/technical/unit-tests.html
@@ -735,7 +735,7 @@ <body class="article"> <div id="header"> <h1>Unit Testing</h1> -<span id="revdate">2024-02-06</span> +<span id="revdate">2024-02-08</span> </div> <div id="content"> <div id="preamble">
diff --git a/trace2-target-values.txt b/trace2-target-values.txt index 3985b6d..06f1953 100644 --- a/trace2-target-values.txt +++ b/trace2-target-values.txt
@@ -5,7 +5,7 @@ * `<absolute-pathname>` - Writes to the file in append mode. If the target already exists and is a directory, the traces will be written to files (one per process) underneath the given directory. -* `af_unix:[<socket_type>:]<absolute-pathname>` - Write to a +* `af_unix:[<socket-type>:]<absolute-pathname>` - Write to a Unix DomainSocket (on platforms that support them). Socket type can be either `stream` or `dgram`; if omitted Git will try both.
diff --git a/urls.txt b/urls.txt index 4e79c15..ce671f8 100644 --- a/urls.txt +++ b/urls.txt
@@ -73,8 +73,8 @@ configuration section of the form: ------------ - [url "<actual url base>"] - insteadOf = <other url base> + [url "<actual-url-base>"] + insteadOf = <other-url-base> ------------ For example, with this: @@ -92,8 +92,8 @@ configuration section of the form: ------------ - [url "<actual url base>"] - pushInsteadOf = <other url base> + [url "<actual-url-base>"] + pushInsteadOf = <other-url-base> ------------ For example, with this:
diff --git a/user-manual.html b/user-manual.html index 2ca99ca..0425119 100644 --- a/user-manual.html +++ b/user-manual.html
@@ -1,5 +1,5 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> -<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>Git User Manual</title><link rel="stylesheet" type="text/css" href="docbook-xsl.css"><meta name="generator" content="DocBook XSL Stylesheets Vsnapshot"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div lang="en" class="book"><div class="titlepage"><div><div><h1 class="title"><a name="id-1"></a>Git User Manual</h1></div><div><div class="revhistory"><table style="border-style:solid; width:100%;" summary="Revision History"><tr><th align="left" valign="top" colspan="2"><b>Revision History</b></th></tr><tr><td align="left"></td><td align="left">2024-02-06</td></tr></table></div></div></div><hr></div><div class="toc"><p><b>Table of Contents</b></p><dl class="toc"><dt><span class="preface"><a href="#_introduction">Introduction</a></span></dt><dt><span class="chapter"><a href="#repositories-and-branches">1. Repositories and Branches</a></span></dt><dd><dl><dt><span class="section"><a href="#how-to-get-a-git-repository">How to get a Git repository</a></span></dt><dt><span class="section"><a href="#how-to-check-out">How to check out a different version of a project</a></span></dt><dt><span class="section"><a href="#understanding-commits">Understanding History: Commits</a></span></dt><dd><dl><dt><span class="section"><a href="#understanding-reachability">Understanding history: commits, parents, and reachability</a></span></dt><dt><span class="section"><a href="#history-diagrams">Understanding history: History diagrams</a></span></dt><dt><span class="section"><a href="#what-is-a-branch">Understanding history: What is a branch?</a></span></dt></dl></dd><dt><span class="section"><a href="#manipulating-branches">Manipulating branches</a></span></dt><dt><span class="section"><a href="#detached-head">Examining an old version without creating a new branch</a></span></dt><dt><span class="section"><a href="#examining-remote-branches">Examining branches from a remote repository</a></span></dt><dt><span class="section"><a href="#how-git-stores-references">Naming branches, tags, and other references</a></span></dt><dt><span class="section"><a href="#Updating-a-repository-With-git-fetch">Updating a repository with git fetch</a></span></dt><dt><span class="section"><a href="#fetching-branches">Fetching branches from other repositories</a></span></dt></dl></dd><dt><span class="chapter"><a href="#exploring-git-history">2. Exploring Git history</a></span></dt><dd><dl><dt><span class="section"><a href="#using-bisect">How to use bisect to find a regression</a></span></dt><dt><span class="section"><a href="#naming-commits">Naming commits</a></span></dt><dt><span class="section"><a href="#creating-tags">Creating tags</a></span></dt><dt><span class="section"><a href="#browsing-revisions">Browsing revisions</a></span></dt><dt><span class="section"><a href="#generating-diffs">Generating diffs</a></span></dt><dt><span class="section"><a href="#viewing-old-file-versions">Viewing old file versions</a></span></dt><dt><span class="section"><a href="#history-examples">Examples</a></span></dt><dd><dl><dt><span class="section"><a href="#counting-commits-on-a-branch">Counting the number of commits on a branch</a></span></dt><dt><span class="section"><a href="#checking-for-equal-branches">Check whether two branches point at the same history</a></span></dt><dt><span class="section"><a href="#finding-tagged-descendants">Find first tagged version including a given fix</a></span></dt><dt><span class="section"><a href="#showing-commits-unique-to-a-branch">Showing commits unique to a given branch</a></span></dt><dt><span class="section"><a href="#making-a-release">Creating a changelog and tarball for a software release</a></span></dt><dt><span class="section"><a href="#Finding-commits-With-given-Content">Finding commits referencing a file with given content</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="#Developing-With-git">3. Developing with Git</a></span></dt><dd><dl><dt><span class="section"><a href="#telling-git-your-name">Telling Git your name</a></span></dt><dt><span class="section"><a href="#creating-a-new-repository">Creating a new repository</a></span></dt><dt><span class="section"><a href="#how-to-make-a-commit">How to make a commit</a></span></dt><dt><span class="section"><a href="#creating-good-commit-messages">Creating good commit messages</a></span></dt><dt><span class="section"><a href="#ignoring-files">Ignoring files</a></span></dt><dt><span class="section"><a href="#how-to-merge">How to merge</a></span></dt><dt><span class="section"><a href="#resolving-a-merge">Resolving a merge</a></span></dt><dd><dl><dt><span class="section"><a href="#conflict-resolution">Getting conflict-resolution help during a merge</a></span></dt></dl></dd><dt><span class="section"><a href="#undoing-a-merge">Undoing a merge</a></span></dt><dt><span class="section"><a href="#fast-forwards">Fast-forward merges</a></span></dt><dt><span class="section"><a href="#fixing-mistakes">Fixing mistakes</a></span></dt><dd><dl><dt><span class="section"><a href="#reverting-a-commit">Fixing a mistake with a new commit</a></span></dt><dt><span class="section"><a href="#fixing-a-mistake-by-rewriting-history">Fixing a mistake by rewriting history</a></span></dt><dt><span class="section"><a href="#checkout-of-path">Checking out an old version of a file</a></span></dt><dt><span class="section"><a href="#interrupted-work">Temporarily setting aside work in progress</a></span></dt></dl></dd><dt><span class="section"><a href="#ensuring-good-performance">Ensuring good performance</a></span></dt><dt><span class="section"><a href="#ensuring-reliability">Ensuring reliability</a></span></dt><dd><dl><dt><span class="section"><a href="#checking-for-corruption">Checking the repository for corruption</a></span></dt><dt><span class="section"><a href="#recovering-lost-changes">Recovering lost changes</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="#sharing-development">4. Sharing development with others</a></span></dt><dd><dl><dt><span class="section"><a href="#getting-updates-With-git-pull">Getting updates with git pull</a></span></dt><dt><span class="section"><a href="#submitting-patches">Submitting patches to a project</a></span></dt><dt><span class="section"><a href="#importing-patches">Importing patches to a project</a></span></dt><dt><span class="section"><a href="#public-repositories">Public Git repositories</a></span></dt><dd><dl><dt><span class="section"><a href="#setting-up-a-public-repository">Setting up a public repository</a></span></dt><dt><span class="section"><a href="#exporting-via-git">Exporting a Git repository via the Git protocol</a></span></dt><dt><span class="section"><a href="#exporting-via-http">Exporting a git repository via HTTP</a></span></dt><dt><span class="section"><a href="#pushing-changes-to-a-public-repository">Pushing changes to a public repository</a></span></dt><dt><span class="section"><a href="#forcing-push">What to do when a push fails</a></span></dt><dt><span class="section"><a href="#setting-up-a-shared-repository">Setting up a shared repository</a></span></dt><dt><span class="section"><a href="#setting-up-gitweb">Allowing web browsing of a repository</a></span></dt></dl></dd><dt><span class="section"><a href="#how-to-get-a-git-repository-with-minimal-history">How to get a Git repository with minimal history</a></span></dt><dt><span class="section"><a href="#sharing-development-examples">Examples</a></span></dt><dd><dl><dt><span class="section"><a href="#maintaining-topic-branches">Maintaining topic branches for a Linux subsystem maintainer</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="#cleaning-up-history">5. Rewriting history and maintaining patch series</a></span></dt><dd><dl><dt><span class="section"><a href="#patch-series">Creating the perfect patch series</a></span></dt><dt><span class="section"><a href="#using-git-rebase">Keeping a patch series up to date using git rebase</a></span></dt><dt><span class="section"><a href="#rewriting-one-commit">Rewriting a single commit</a></span></dt><dt><span class="section"><a href="#reordering-patch-series">Reordering or selecting from a patch series</a></span></dt><dt><span class="section"><a href="#interactive-rebase">Using interactive rebases</a></span></dt><dt><span class="section"><a href="#patch-series-tools">Other tools</a></span></dt><dt><span class="section"><a href="#problems-With-rewriting-history">Problems with rewriting history</a></span></dt><dt><span class="section"><a href="#bisect-merges">Why bisecting merge commits can be harder than bisecting linear history</a></span></dt></dl></dd><dt><span class="chapter"><a href="#advanced-branch-management">6. Advanced branch management</a></span></dt><dd><dl><dt><span class="section"><a href="#fetching-individual-branches">Fetching individual branches</a></span></dt><dt><span class="section"><a href="#fetch-fast-forwards">git fetch and fast-forwards</a></span></dt><dt><span class="section"><a href="#forcing-fetch">Forcing git fetch to do non-fast-forward updates</a></span></dt><dt><span class="section"><a href="#remote-branch-configuration">Configuring remote-tracking branches</a></span></dt></dl></dd><dt><span class="chapter"><a href="#git-concepts">7. Git concepts</a></span></dt><dd><dl><dt><span class="section"><a href="#the-object-database">The Object Database</a></span></dt><dd><dl><dt><span class="section"><a href="#commit-object">Commit Object</a></span></dt><dt><span class="section"><a href="#tree-object">Tree Object</a></span></dt><dt><span class="section"><a href="#blob-object">Blob Object</a></span></dt><dt><span class="section"><a href="#trust">Trust</a></span></dt><dt><span class="section"><a href="#tag-object">Tag Object</a></span></dt><dt><span class="section"><a href="#pack-files">How Git stores objects efficiently: pack files</a></span></dt><dt><span class="section"><a href="#dangling-objects">Dangling objects</a></span></dt><dt><span class="section"><a href="#recovering-from-repository-corruption">Recovering from repository corruption</a></span></dt></dl></dd><dt><span class="section"><a href="#the-index">The index</a></span></dt></dl></dd><dt><span class="chapter"><a href="#submodules">8. Submodules</a></span></dt><dd><dl><dt><span class="section"><a href="#pitfalls-with-submodules">Pitfalls with submodules</a></span></dt></dl></dd><dt><span class="chapter"><a href="#low-level-operations">9. Low-level Git operations</a></span></dt><dd><dl><dt><span class="section"><a href="#object-manipulation">Object access and manipulation</a></span></dt><dt><span class="section"><a href="#the-workflow">The Workflow</a></span></dt><dd><dl><dt><span class="section"><a href="#working-directory-to-index">working directory → index</a></span></dt><dt><span class="section"><a href="#index-to-object-database">index → object database</a></span></dt><dt><span class="section"><a href="#object-database-to-index">object database → index</a></span></dt><dt><span class="section"><a href="#index-to-working-directory">index → working directory</a></span></dt><dt><span class="section"><a href="#tying-it-all-together">Tying it all together</a></span></dt></dl></dd><dt><span class="section"><a href="#examining-the-data">Examining the data</a></span></dt><dt><span class="section"><a href="#merging-multiple-trees">Merging multiple trees</a></span></dt><dt><span class="section"><a href="#merging-multiple-trees-2">Merging multiple trees, continued</a></span></dt></dl></dd><dt><span class="chapter"><a href="#hacking-git">10. Hacking Git</a></span></dt><dd><dl><dt><span class="section"><a href="#object-details">Object storage format</a></span></dt><dt><span class="section"><a href="#birdview-on-the-source-code">A birds-eye view of Git’s source code</a></span></dt></dl></dd><dt><span class="chapter"><a href="#glossary">11. Git Glossary</a></span></dt><dd><dl><dt><span class="section"><a href="#git-explained">Git explained</a></span></dt></dl></dd><dt><span class="appendix"><a href="#git-quick-start">A. Git Quick Reference</a></span></dt><dd><dl><dt><span class="section"><a href="#quick-creating-a-new-repository">Creating a new repository</a></span></dt><dt><span class="section"><a href="#managing-branches">Managing branches</a></span></dt><dt><span class="section"><a href="#exploring-history">Exploring history</a></span></dt><dt><span class="section"><a href="#making-changes">Making changes</a></span></dt><dt><span class="section"><a href="#merging">Merging</a></span></dt><dt><span class="section"><a href="#sharing-your-changes">Sharing your changes</a></span></dt><dt><span class="section"><a href="#repository-maintenance">Repository maintenance</a></span></dt></dl></dd><dt><span class="appendix"><a href="#todo">B. Notes and todo list for this manual</a></span></dt><dd><dl><dt><span class="section"><a href="#todo-list">Todo list</a></span></dt></dl></dd></dl></div><div class="preface"><div class="titlepage"><div><div><h1 class="title"><a name="_introduction"></a>Introduction</h1></div></div></div><p>Git is a fast distributed revision control system.</p><p>This manual is designed to be readable by someone with basic UNIX +<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>Git User Manual</title><link rel="stylesheet" type="text/css" href="docbook-xsl.css"><meta name="generator" content="DocBook XSL Stylesheets Vsnapshot"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div lang="en" class="book"><div class="titlepage"><div><div><h1 class="title"><a name="id-1"></a>Git User Manual</h1></div><div><div class="revhistory"><table style="border-style:solid; width:100%;" summary="Revision History"><tr><th align="left" valign="top" colspan="2"><b>Revision History</b></th></tr><tr><td align="left"></td><td align="left">2024-02-08</td></tr></table></div></div></div><hr></div><div class="toc"><p><b>Table of Contents</b></p><dl class="toc"><dt><span class="preface"><a href="#_introduction">Introduction</a></span></dt><dt><span class="chapter"><a href="#repositories-and-branches">1. Repositories and Branches</a></span></dt><dd><dl><dt><span class="section"><a href="#how-to-get-a-git-repository">How to get a Git repository</a></span></dt><dt><span class="section"><a href="#how-to-check-out">How to check out a different version of a project</a></span></dt><dt><span class="section"><a href="#understanding-commits">Understanding History: Commits</a></span></dt><dd><dl><dt><span class="section"><a href="#understanding-reachability">Understanding history: commits, parents, and reachability</a></span></dt><dt><span class="section"><a href="#history-diagrams">Understanding history: History diagrams</a></span></dt><dt><span class="section"><a href="#what-is-a-branch">Understanding history: What is a branch?</a></span></dt></dl></dd><dt><span class="section"><a href="#manipulating-branches">Manipulating branches</a></span></dt><dt><span class="section"><a href="#detached-head">Examining an old version without creating a new branch</a></span></dt><dt><span class="section"><a href="#examining-remote-branches">Examining branches from a remote repository</a></span></dt><dt><span class="section"><a href="#how-git-stores-references">Naming branches, tags, and other references</a></span></dt><dt><span class="section"><a href="#Updating-a-repository-With-git-fetch">Updating a repository with git fetch</a></span></dt><dt><span class="section"><a href="#fetching-branches">Fetching branches from other repositories</a></span></dt></dl></dd><dt><span class="chapter"><a href="#exploring-git-history">2. Exploring Git history</a></span></dt><dd><dl><dt><span class="section"><a href="#using-bisect">How to use bisect to find a regression</a></span></dt><dt><span class="section"><a href="#naming-commits">Naming commits</a></span></dt><dt><span class="section"><a href="#creating-tags">Creating tags</a></span></dt><dt><span class="section"><a href="#browsing-revisions">Browsing revisions</a></span></dt><dt><span class="section"><a href="#generating-diffs">Generating diffs</a></span></dt><dt><span class="section"><a href="#viewing-old-file-versions">Viewing old file versions</a></span></dt><dt><span class="section"><a href="#history-examples">Examples</a></span></dt><dd><dl><dt><span class="section"><a href="#counting-commits-on-a-branch">Counting the number of commits on a branch</a></span></dt><dt><span class="section"><a href="#checking-for-equal-branches">Check whether two branches point at the same history</a></span></dt><dt><span class="section"><a href="#finding-tagged-descendants">Find first tagged version including a given fix</a></span></dt><dt><span class="section"><a href="#showing-commits-unique-to-a-branch">Showing commits unique to a given branch</a></span></dt><dt><span class="section"><a href="#making-a-release">Creating a changelog and tarball for a software release</a></span></dt><dt><span class="section"><a href="#Finding-commits-With-given-Content">Finding commits referencing a file with given content</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="#Developing-With-git">3. Developing with Git</a></span></dt><dd><dl><dt><span class="section"><a href="#telling-git-your-name">Telling Git your name</a></span></dt><dt><span class="section"><a href="#creating-a-new-repository">Creating a new repository</a></span></dt><dt><span class="section"><a href="#how-to-make-a-commit">How to make a commit</a></span></dt><dt><span class="section"><a href="#creating-good-commit-messages">Creating good commit messages</a></span></dt><dt><span class="section"><a href="#ignoring-files">Ignoring files</a></span></dt><dt><span class="section"><a href="#how-to-merge">How to merge</a></span></dt><dt><span class="section"><a href="#resolving-a-merge">Resolving a merge</a></span></dt><dd><dl><dt><span class="section"><a href="#conflict-resolution">Getting conflict-resolution help during a merge</a></span></dt></dl></dd><dt><span class="section"><a href="#undoing-a-merge">Undoing a merge</a></span></dt><dt><span class="section"><a href="#fast-forwards">Fast-forward merges</a></span></dt><dt><span class="section"><a href="#fixing-mistakes">Fixing mistakes</a></span></dt><dd><dl><dt><span class="section"><a href="#reverting-a-commit">Fixing a mistake with a new commit</a></span></dt><dt><span class="section"><a href="#fixing-a-mistake-by-rewriting-history">Fixing a mistake by rewriting history</a></span></dt><dt><span class="section"><a href="#checkout-of-path">Checking out an old version of a file</a></span></dt><dt><span class="section"><a href="#interrupted-work">Temporarily setting aside work in progress</a></span></dt></dl></dd><dt><span class="section"><a href="#ensuring-good-performance">Ensuring good performance</a></span></dt><dt><span class="section"><a href="#ensuring-reliability">Ensuring reliability</a></span></dt><dd><dl><dt><span class="section"><a href="#checking-for-corruption">Checking the repository for corruption</a></span></dt><dt><span class="section"><a href="#recovering-lost-changes">Recovering lost changes</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="#sharing-development">4. Sharing development with others</a></span></dt><dd><dl><dt><span class="section"><a href="#getting-updates-With-git-pull">Getting updates with git pull</a></span></dt><dt><span class="section"><a href="#submitting-patches">Submitting patches to a project</a></span></dt><dt><span class="section"><a href="#importing-patches">Importing patches to a project</a></span></dt><dt><span class="section"><a href="#public-repositories">Public Git repositories</a></span></dt><dd><dl><dt><span class="section"><a href="#setting-up-a-public-repository">Setting up a public repository</a></span></dt><dt><span class="section"><a href="#exporting-via-git">Exporting a Git repository via the Git protocol</a></span></dt><dt><span class="section"><a href="#exporting-via-http">Exporting a git repository via HTTP</a></span></dt><dt><span class="section"><a href="#pushing-changes-to-a-public-repository">Pushing changes to a public repository</a></span></dt><dt><span class="section"><a href="#forcing-push">What to do when a push fails</a></span></dt><dt><span class="section"><a href="#setting-up-a-shared-repository">Setting up a shared repository</a></span></dt><dt><span class="section"><a href="#setting-up-gitweb">Allowing web browsing of a repository</a></span></dt></dl></dd><dt><span class="section"><a href="#how-to-get-a-git-repository-with-minimal-history">How to get a Git repository with minimal history</a></span></dt><dt><span class="section"><a href="#sharing-development-examples">Examples</a></span></dt><dd><dl><dt><span class="section"><a href="#maintaining-topic-branches">Maintaining topic branches for a Linux subsystem maintainer</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="#cleaning-up-history">5. Rewriting history and maintaining patch series</a></span></dt><dd><dl><dt><span class="section"><a href="#patch-series">Creating the perfect patch series</a></span></dt><dt><span class="section"><a href="#using-git-rebase">Keeping a patch series up to date using git rebase</a></span></dt><dt><span class="section"><a href="#rewriting-one-commit">Rewriting a single commit</a></span></dt><dt><span class="section"><a href="#reordering-patch-series">Reordering or selecting from a patch series</a></span></dt><dt><span class="section"><a href="#interactive-rebase">Using interactive rebases</a></span></dt><dt><span class="section"><a href="#patch-series-tools">Other tools</a></span></dt><dt><span class="section"><a href="#problems-With-rewriting-history">Problems with rewriting history</a></span></dt><dt><span class="section"><a href="#bisect-merges">Why bisecting merge commits can be harder than bisecting linear history</a></span></dt></dl></dd><dt><span class="chapter"><a href="#advanced-branch-management">6. Advanced branch management</a></span></dt><dd><dl><dt><span class="section"><a href="#fetching-individual-branches">Fetching individual branches</a></span></dt><dt><span class="section"><a href="#fetch-fast-forwards">git fetch and fast-forwards</a></span></dt><dt><span class="section"><a href="#forcing-fetch">Forcing git fetch to do non-fast-forward updates</a></span></dt><dt><span class="section"><a href="#remote-branch-configuration">Configuring remote-tracking branches</a></span></dt></dl></dd><dt><span class="chapter"><a href="#git-concepts">7. Git concepts</a></span></dt><dd><dl><dt><span class="section"><a href="#the-object-database">The Object Database</a></span></dt><dd><dl><dt><span class="section"><a href="#commit-object">Commit Object</a></span></dt><dt><span class="section"><a href="#tree-object">Tree Object</a></span></dt><dt><span class="section"><a href="#blob-object">Blob Object</a></span></dt><dt><span class="section"><a href="#trust">Trust</a></span></dt><dt><span class="section"><a href="#tag-object">Tag Object</a></span></dt><dt><span class="section"><a href="#pack-files">How Git stores objects efficiently: pack files</a></span></dt><dt><span class="section"><a href="#dangling-objects">Dangling objects</a></span></dt><dt><span class="section"><a href="#recovering-from-repository-corruption">Recovering from repository corruption</a></span></dt></dl></dd><dt><span class="section"><a href="#the-index">The index</a></span></dt></dl></dd><dt><span class="chapter"><a href="#submodules">8. Submodules</a></span></dt><dd><dl><dt><span class="section"><a href="#pitfalls-with-submodules">Pitfalls with submodules</a></span></dt></dl></dd><dt><span class="chapter"><a href="#low-level-operations">9. Low-level Git operations</a></span></dt><dd><dl><dt><span class="section"><a href="#object-manipulation">Object access and manipulation</a></span></dt><dt><span class="section"><a href="#the-workflow">The Workflow</a></span></dt><dd><dl><dt><span class="section"><a href="#working-directory-to-index">working directory → index</a></span></dt><dt><span class="section"><a href="#index-to-object-database">index → object database</a></span></dt><dt><span class="section"><a href="#object-database-to-index">object database → index</a></span></dt><dt><span class="section"><a href="#index-to-working-directory">index → working directory</a></span></dt><dt><span class="section"><a href="#tying-it-all-together">Tying it all together</a></span></dt></dl></dd><dt><span class="section"><a href="#examining-the-data">Examining the data</a></span></dt><dt><span class="section"><a href="#merging-multiple-trees">Merging multiple trees</a></span></dt><dt><span class="section"><a href="#merging-multiple-trees-2">Merging multiple trees, continued</a></span></dt></dl></dd><dt><span class="chapter"><a href="#hacking-git">10. Hacking Git</a></span></dt><dd><dl><dt><span class="section"><a href="#object-details">Object storage format</a></span></dt><dt><span class="section"><a href="#birdview-on-the-source-code">A birds-eye view of Git’s source code</a></span></dt></dl></dd><dt><span class="chapter"><a href="#glossary">11. Git Glossary</a></span></dt><dd><dl><dt><span class="section"><a href="#git-explained">Git explained</a></span></dt></dl></dd><dt><span class="appendix"><a href="#git-quick-start">A. Git Quick Reference</a></span></dt><dd><dl><dt><span class="section"><a href="#quick-creating-a-new-repository">Creating a new repository</a></span></dt><dt><span class="section"><a href="#managing-branches">Managing branches</a></span></dt><dt><span class="section"><a href="#exploring-history">Exploring history</a></span></dt><dt><span class="section"><a href="#making-changes">Making changes</a></span></dt><dt><span class="section"><a href="#merging">Merging</a></span></dt><dt><span class="section"><a href="#sharing-your-changes">Sharing your changes</a></span></dt><dt><span class="section"><a href="#repository-maintenance">Repository maintenance</a></span></dt></dl></dd><dt><span class="appendix"><a href="#todo">B. Notes and todo list for this manual</a></span></dt><dd><dl><dt><span class="section"><a href="#todo-list">Todo list</a></span></dt></dl></dd></dl></div><div class="preface"><div class="titlepage"><div><div><h1 class="title"><a name="_introduction"></a>Introduction</h1></div></div></div><p>Git is a fast distributed revision control system.</p><p>This manual is designed to be readable by someone with basic UNIX command-line skills, but no previous knowledge of Git.</p><p><a class="xref" href="#repositories-and-branches" title="Chapter 1. Repositories and Branches">Chapter 1, <i>Repositories and Branches</i></a> and <a class="xref" href="#exploring-git-history" title="Chapter 2. Exploring Git history">Chapter 2, <i>Exploring Git history</i></a> explain how to fetch and study a project using git—read these chapters to learn how to build and test a particular version of a software project, search for @@ -1863,8 +1863,8 @@ be validated by verifying that (a) their hashes match the content of the file and (b) the object successfully inflates to a stream of bytes that forms a sequence of -<code class="literal"><ascii type without space> + <space> + <ascii decimal size> + -<byte\0> + <binary object data></code>.</p><p>The structured objects can further have their structure and +<code class="literal"><ascii-type-without-space> + <space> + <ascii-decimal-size> + +<byte\0> + <binary-object-data></code>.</p><p>The structured objects can further have their structure and connectivity to other objects verified. This is generally done with the <code class="literal">git fsck</code> program, which generates a full dependency graph of all objects, and verifies their internal consistency (in addition
diff --git a/user-manual.txt b/user-manual.txt index 5d32ff2..6433903 100644 --- a/user-manual.txt +++ b/user-manual.txt
@@ -4100,8 +4100,8 @@ be validated by verifying that (a) their hashes match the content of the file and (b) the object successfully inflates to a stream of bytes that forms a sequence of -`<ascii type without space> + <space> + <ascii decimal size> + -<byte\0> + <binary object data>`. +`<ascii-type-without-space> + <space> + <ascii-decimal-size> + +<byte\0> + <binary-object-data>`. The structured objects can further have their structure and connectivity to other objects verified. This is generally done with
